From 1b8373f03ec8c25b249304ea8d9544a202c5fbb2 Mon Sep 17 00:00:00 2001
From: qorg11 <qorg@vxempire.xyz>
Date: Wed, 22 Apr 2020 02:49:13 +0200
Subject: [PATCH] --file not needed anymore, cleaned up code in lainsafecli and
upload.cgi
---
http/upload.cgi | 2 --
lainsafecli | 18 ++++++++++++------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/http/upload.cgi b/http/upload.cgi
index 761ba4e..c876fb6 100755
--- a/http/upload.cgi
+++ b/http/upload.cgi
@@ -15,8 +15,6 @@
# along with lainsafe. If not, see <https://www.gnu.org/licenses/>.
use CGI;
-use Digest::MD5 qw(md5_hex);
-
my $q = CGI->new;
print $q->header();
diff --git a/lainsafecli b/lainsafecli
index 2e14170..17c1be5 100755
--- a/lainsafecli
+++ b/lainsafecli
@@ -20,8 +20,6 @@
use Getopt::Long;
use LWP::UserAgent;
-use Data::Dumper;
-use Try::Tiny;
use strict;
use warnings;
@@ -66,7 +64,7 @@ EOF
sub help
{
print "lainsafecli, a command line interface for lainsafe.\n";
- print "USAGE: lainsafecli [--server] --file=FILE\n\n";
+ print "USAGE: lainsafecli [--server] FILE\n\n";
print "if --server not given, $DEFAULT_SERVER is used.\n";
exit;
@@ -75,15 +73,23 @@ sub help
## PROGRAM
my $ua = LWP::UserAgent->new;
GetOptions ("server=s" => \$DEFAULT_SERVER,
- "file=s" => \$file,
- "help" => \$help);
+ "help|" => \$help);
-&help if ($help);
+if($help || not defined $ARGV[0])
+{
+ &help;
+}
# check if file is given
+$file = $ARGV[@ARGV-1];
+
+die "File does not exist\n" if !-e $file;
+
die "Give a file\n" unless defined $file;
+
+
my $url_to_upload = $DEFAULT_SERVER . "/upload.cgi";
my $req;
--
GitLab