Commit 9d92aeee authored by Vitaly Lipatov's avatar Vitaly Lipatov

eget: simplify User-Agent handling, remove eval and duplication

parent e473a603
...@@ -309,9 +309,7 @@ verbose='' ...@@ -309,9 +309,7 @@ verbose=''
WGETNOSSLCHECK='' WGETNOSSLCHECK=''
CURLNOSSLCHECK='' CURLNOSSLCHECK=''
AXELNOSSLCHECK='' AXELNOSSLCHECK=''
WGETUSERAGENT='' USERAGENT=''
CURLUSERAGENT=''
AXELUSERAGENT=''
WGETHEADER='' WGETHEADER=''
CURLHEADER='' CURLHEADER=''
AXELHEADER='' AXELHEADER=''
...@@ -513,10 +511,7 @@ while [ -n "$1" ] ; do ...@@ -513,10 +511,7 @@ while [ -n "$1" ] ; do
USEOUTPUTDIR="$1" USEOUTPUTDIR="$1"
;; ;;
-U|-A|--user-agent) -U|-A|--user-agent)
user_agent="Mozilla/5.0 (X11; Linux $arch) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36" #" USERAGENT="Mozilla/5.0 (X11; Linux $arch) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36"
WGETUSERAGENT="-U '$user_agent'"
CURLUSERAGENT="-A '$user_agent'"
AXELUSERAGENT="--user-agent='$user_agent'"
;; ;;
--compressed) --compressed)
CURLCOMPRESSED='--compressed' CURLCOMPRESSED='--compressed'
...@@ -1030,11 +1025,8 @@ esac ...@@ -1030,11 +1025,8 @@ esac
# Defined globally so it can be used by aria2/axel backends for header operations # Defined globally so it can be used by aria2/axel backends for header operations
__wget() __wget()
{ {
if [ -n "$WGETUSERAGENT" ] ; then [ -n "$USERAGENT" ] && set -- -U "$USERAGENT" "$@"
docmd $WGET $FORCEIPV $WGETQ $WGETSHOWPROGRESS $NOGLOB $WGETCOMPRESSED $WGETHEADER $WGETOUTPUTDIR $WGETNOSSLCHECK $WGETNODIRECTORIES $WGETCONTINUE $WGETTIMEOUT $WGETREADTIMEOUT $WGETRETRYCONNREFUSED $WGETTRIES $WGETLOADCOOKIES $WGETRUSTSERVERNAMES "$(eval echo "$WGETUSERAGENT")" $EGET_WGET_OPTIONS "$@"
else
docmd $WGET $FORCEIPV $WGETQ $WGETSHOWPROGRESS $NOGLOB $WGETCOMPRESSED $WGETHEADER $WGETOUTPUTDIR $WGETNOSSLCHECK $WGETNODIRECTORIES $WGETCONTINUE $WGETTIMEOUT $WGETREADTIMEOUT $WGETRETRYCONNREFUSED $WGETTRIES $WGETLOADCOOKIES $WGETRUSTSERVERNAMES $EGET_WGET_OPTIONS "$@" docmd $WGET $FORCEIPV $WGETQ $WGETSHOWPROGRESS $NOGLOB $WGETCOMPRESSED $WGETHEADER $WGETOUTPUTDIR $WGETNOSSLCHECK $WGETNODIRECTORIES $WGETCONTINUE $WGETTIMEOUT $WGETREADTIMEOUT $WGETRETRYCONNREFUSED $WGETTRIES $WGETLOADCOOKIES $WGETRUSTSERVERNAMES $EGET_WGET_OPTIONS "$@"
fi
} }
...@@ -1230,11 +1222,8 @@ elif [ "$EGET_BACKEND" = "curl" ] ; then ...@@ -1230,11 +1222,8 @@ elif [ "$EGET_BACKEND" = "curl" ] ; then
__curl() __curl()
{ {
if [ -n "$CURLUSERAGENT" ] ; then [ -n "$USERAGENT" ] && set -- -A "$USERAGENT" "$@"
docmd $CURL $FORCEIPV --fail -L $CURLQ $CURLSHOWPROGRESS $CURLCOMPRESSED $CURLHEADER $CURLOUTPUTDIR $CURLNOSSLCHECK $CURLCONTINUE $CURLMAXTIME $CURLRETRYCONNREFUSED $CURLRETRY $CURLCOOKIE $CURLTRUSTSERVERNAMES "$(eval echo "$CURLUSERAGENT")" $EGET_CURL_OPTIONS "$@"
else
docmd $CURL $FORCEIPV --fail -L $CURLQ $CURLSHOWPROGRESS $CURLCOMPRESSED $CURLHEADER $CURLOUTPUTDIR $CURLNOSSLCHECK $CURLCONTINUE $CURLMAXTIME $CURLRETRYCONNREFUSED $CURLRETRY $CURLCOOKIE $CURLTRUSTSERVERNAMES $EGET_CURL_OPTIONS "$@" docmd $CURL $FORCEIPV --fail -L $CURLQ $CURLSHOWPROGRESS $CURLCOMPRESSED $CURLHEADER $CURLOUTPUTDIR $CURLNOSSLCHECK $CURLCONTINUE $CURLMAXTIME $CURLRETRYCONNREFUSED $CURLRETRY $CURLCOOKIE $CURLTRUSTSERVERNAMES $EGET_CURL_OPTIONS "$@"
fi
} }
# put remote content to stdout # put remote content to stdout
url_scat() url_scat()
...@@ -1352,11 +1341,8 @@ __axel() ...@@ -1352,11 +1341,8 @@ __axel()
local AXELQ_LOCAL="$AXELQ" local AXELQ_LOCAL="$AXELQ"
# --show-progress overrides --quiet for axel # --show-progress overrides --quiet for axel
[ -n "$AXELSHOWPROGRESS" ] && AXELQ_LOCAL='' [ -n "$AXELSHOWPROGRESS" ] && AXELQ_LOCAL=''
if [ -n "$AXELUSERAGENT" ] ; then [ -n "$USERAGENT" ] && set -- --user-agent="$USERAGENT" "$@"
docmd $AXEL $FORCEIPV $AXELQ_LOCAL $AXELOUTPUTDIR $AXELCONTINUE $AXELTIMEOUT $AXELHEADER $AXELNOSSLCHECK "$(eval echo "$AXELUSERAGENT")" $EGET_AXEL_OPTIONS "$@"
else
docmd $AXEL $FORCEIPV $AXELQ_LOCAL $AXELOUTPUTDIR $AXELCONTINUE $AXELTIMEOUT $AXELHEADER $AXELNOSSLCHECK $EGET_AXEL_OPTIONS "$@" docmd $AXEL $FORCEIPV $AXELQ_LOCAL $AXELOUTPUTDIR $AXELCONTINUE $AXELTIMEOUT $AXELHEADER $AXELNOSSLCHECK $EGET_AXEL_OPTIONS "$@"
fi
} }
# put remote content to stdout # put remote content to stdout
......
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