Merge 944b269ccd
into ad157c73aa
This commit is contained in:
commit
9a82ad32de
|
@ -199,19 +199,31 @@ function download_component() {
|
||||||
if [ "$ariapkg" == "true" ]; then
|
if [ "$ariapkg" == "true" ]; then
|
||||||
show_message "using aria2c to download $4"
|
show_message "using aria2c to download $4"
|
||||||
aria2c -c -x 8 -d "$CACHE_PATH" -o $4 $3
|
aria2c -c -x 8 -d "$CACHE_PATH" -o $4 $3
|
||||||
downrez=$?
|
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
notify-send "Photoshop CC" "$4 download completed" -i "download"
|
||||||
|
fi
|
||||||
|
|
||||||
elif [ "$curlpkg" == "true" ]; then
|
elif [ "$curlpkg" == "true" ]; then
|
||||||
show_message "using curl to download $4"
|
show_message "using curl to download $4"
|
||||||
curl $3 -o $1
|
while true; do
|
||||||
downrez=$?
|
curl -C - --progress-bar -o $1 $3
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
notify-send "Photoshop CC" "$4 download completed" -i "download"
|
||||||
|
break
|
||||||
|
else
|
||||||
|
show_message "Download failed, waiting before retrying..."
|
||||||
|
sleep $((tout*5))
|
||||||
|
((tout++))
|
||||||
|
fi
|
||||||
|
done
|
||||||
else
|
else
|
||||||
show_message "using wget to download $4"
|
show_message "using wget to download $4"
|
||||||
wget "$3" -P "$CACHE_PATH"
|
wget --no-check-certificate "$3" -P "$CACHE_PATH"
|
||||||
downrez=$?
|
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
notify-send "Photoshop CC" "$4 download completed" -i "download"
|
||||||
fi
|
fi
|
||||||
if [ "$downrez" -eq 0 ];then
|
|
||||||
notify-send "Illustrator CC" "$4 download completed" -i "download"
|
|
||||||
fi
|
fi
|
||||||
((tout++))
|
((tout++))
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue