From 324794c7a5a8344455aa4e6a29b79b2943530cce Mon Sep 17 00:00:00 2001 From: victor Date: Sat, 9 Jan 2021 14:16:33 +0330 Subject: [PATCH] downloading files using aria2 or curl or wget --- scripts/sharedFuncs.sh | 10 ++++++++-- setup.sh | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/sharedFuncs.sh b/scripts/sharedFuncs.sh index 808828a..877830e 100644 --- a/scripts/sharedFuncs.sh +++ b/scripts/sharedFuncs.sh @@ -193,14 +193,20 @@ function download_component() { fi else show_message "downloading $4 ..." - pkgres=$(package_installed aria2c "summary") - if [ "$pkgres" == "true" ];then + ariapkg=$(package_installed aria2c "summary") + curlpkg=$(package_installed curl "summary") + + if [ "$ariapkg" == "true" ];then show_message "using aria2c to download $4" aria2c -c -x 8 -d "$CACHE_PATH" -o $4 $3 if [ $? -eq 0 ];then notify-send "$4 download completed" -i "download" fi + + elif [ "$curlpkg" == "true" ];then + show_message "using curl to download $4" + curl $3 -o $1 else show_message "using wget to download $4" wget "$3" -P "$CACHE_PATH" diff --git a/setup.sh b/setup.sh index da11fd3..54f207a 100755 --- a/setup.sh +++ b/setup.sh @@ -12,7 +12,7 @@ function main() { case "$answer" in 1) - echo "run illustrator CC Installation..." + echo -n "run illustrator CC Installation..." run_script "scripts/illustratorSetup.sh" "illustratorSetup.sh" ;; 2) @@ -20,7 +20,7 @@ function main() { run_script "scripts/resetIllustrator.sh" "resetIllustrator.sh" ;; 3) - echo "run winecfg..." + echo "runing winecfg" echo -n "open virtualdrive configuration..." run_script "scripts/winecfg.sh" "winecfg.sh" ;;