Merge d070e8f7f3
into 5f8f0adcdd
This commit is contained in:
commit
6f5d564f5f
|
@ -183,6 +183,7 @@ function download_component() {
|
||||||
show_message "downloading $4 ..."
|
show_message "downloading $4 ..."
|
||||||
ariapkg=$(package_installed aria2c "summary")
|
ariapkg=$(package_installed aria2c "summary")
|
||||||
curlpkg=$(package_installed curl "summary")
|
curlpkg=$(package_installed curl "summary")
|
||||||
|
wgetpkg=$(package_installed wget "summary")
|
||||||
|
|
||||||
if [ "$ariapkg" == "true" ];then
|
if [ "$ariapkg" == "true" ];then
|
||||||
show_message "using aria2c to download $4"
|
show_message "using aria2c to download $4"
|
||||||
|
@ -192,16 +193,16 @@ function download_component() {
|
||||||
notify-send "Photoshop CC" "$4 download completed" -i "download"
|
notify-send "Photoshop CC" "$4 download completed" -i "download"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
elif [ "$curlpkg" == "true" ];then
|
elif [ "$wgetpkg" == "true" ];then
|
||||||
show_message "using curl to download $4"
|
|
||||||
curl $3 -o $1
|
|
||||||
else
|
|
||||||
show_message "using wget to download $4"
|
show_message "using wget to download $4"
|
||||||
wget --no-check-certificate "$3" -P "$CACHE_PATH"
|
wget --no-check-certificate "$3" -P "$CACHE_PATH"
|
||||||
|
|
||||||
if [ $? -eq 0 ];then
|
if [ $? -eq 0 ];then
|
||||||
notify-send "Photoshop CC" "$4 download completed" -i "download"
|
notify-send "Photoshop CC" "$4 download completed" -i "download"
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
show_message "using curl to download $4"
|
||||||
|
curl $3 -o $1
|
||||||
fi
|
fi
|
||||||
((tout++))
|
((tout++))
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue