Commit e545622e authored by Vitaly Lipatov's avatar Vitaly Lipatov

eget: add argument validation for options with required parameters

parent d468a1f7
...@@ -505,6 +505,7 @@ while [ -n "$1" ] ; do ...@@ -505,6 +505,7 @@ while [ -n "$1" ] ; do
shift shift
argvalue="$(printf '%s' "$1" | tr -d ' ')" argvalue="$(printf '%s' "$1" | tr -d ' ')"
fi fi
[ -z "$argvalue" ] && fatal "Error: --header requires an argument"
WGETHEADER="--header=$argvalue" WGETHEADER="--header=$argvalue"
CURLHEADER="--header $argvalue" CURLHEADER="--header $argvalue"
AXELHEADER="--header=$argvalue" AXELHEADER="--header=$argvalue"
...@@ -514,6 +515,7 @@ while [ -n "$1" ] ; do ...@@ -514,6 +515,7 @@ while [ -n "$1" ] ; do
shift shift
argvalue="$1" argvalue="$1"
fi fi
[ -z "$argvalue" ] && fatal "Error: --output-dir requires an argument"
CURLOUTPUTDIR="--create-dirs --output-dir $argvalue" CURLOUTPUTDIR="--create-dirs --output-dir $argvalue"
WGETOUTPUTDIR="-P $argvalue" WGETOUTPUTDIR="-P $argvalue"
ARIA2OUTPUTDIR="-d $argvalue" ARIA2OUTPUTDIR="-d $argvalue"
...@@ -595,6 +597,7 @@ while [ -n "$1" ] ; do ...@@ -595,6 +597,7 @@ while [ -n "$1" ] ; do
shift shift
argvalue="$1" argvalue="$1"
fi fi
[ -z "$argvalue" ] && fatal "Error: --input-file requires an argument"
INPUTFILE="$argvalue" INPUTFILE="$argvalue"
;; ;;
-T|--timeout) -T|--timeout)
...@@ -602,6 +605,7 @@ while [ -n "$1" ] ; do ...@@ -602,6 +605,7 @@ while [ -n "$1" ] ; do
shift shift
argvalue="$1" argvalue="$1"
fi fi
[ -z "$argvalue" ] && fatal "Error: --timeout requires an argument"
WGETTIMEOUT="--timeout $argvalue" WGETTIMEOUT="--timeout $argvalue"
CURLMAXTIME="--max-time $argvalue" CURLMAXTIME="--max-time $argvalue"
AXELTIMEOUT="--timeout=$argvalue" AXELTIMEOUT="--timeout=$argvalue"
...@@ -611,6 +615,7 @@ while [ -n "$1" ] ; do ...@@ -611,6 +615,7 @@ while [ -n "$1" ] ; do
shift shift
argvalue="$1" argvalue="$1"
fi fi
[ -z "$argvalue" ] && fatal "Error: --read-timeout requires an argument"
WGETREADTIMEOUT="--read-timeout $argvalue" WGETREADTIMEOUT="--read-timeout $argvalue"
if [ -z "$CURLMAXTIME" ] ; then if [ -z "$CURLMAXTIME" ] ; then
CURLMAXTIME="--max-time $argvalue" CURLMAXTIME="--max-time $argvalue"
...@@ -632,6 +637,7 @@ while [ -n "$1" ] ; do ...@@ -632,6 +637,7 @@ while [ -n "$1" ] ; do
shift shift
argvalue="$1" argvalue="$1"
fi fi
[ -z "$argvalue" ] && fatal "Error: --tries requires an argument"
case "$argvalue" in case "$argvalue" in
0|inf) 0|inf)
...@@ -653,6 +659,7 @@ while [ -n "$1" ] ; do ...@@ -653,6 +659,7 @@ while [ -n "$1" ] ; do
shift shift
argvalue="$1" argvalue="$1"
fi fi
[ -z "$argvalue" ] && fatal "Error: --load-cookies requires an argument"
WGETLOADCOOKIES="--load-cookies $argvalue" WGETLOADCOOKIES="--load-cookies $argvalue"
CURLCOOKIE="--cookie $argvalue" CURLCOOKIE="--cookie $argvalue"
;; ;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment