Changeset 5102 for zero-center/trunk/fuentes/install-files/usr/bin/zero-lliurex-wget

Timestamp:

Jun 6, 2017, 5:37:59 PM (4 years ago)

Author:

jrpelegrina

Message:

Updated changelog. Fix some bugs in helpers

File:

• zero-center/trunk/fuentes/install-files/usr/bin/zero-lliurex-wget (modified) (3 diffs)

zero-center/trunk/fuentes/install-files/usr/bin/zero-lliurex-wget

@@ -10 +10 @@
 MSG_DONWLOADING=$(gettext "Downloading")
 MSG_FROM=$(gettext "from")
+MSG_AT=$(gettext "at")
+MSG_IN=$(gettext "in")
+MSG_EXISTS_FILE=$(gettext "exists, you have to delete it before if you want to download it again")
 MSG_CHECKING=$(gettext "Cheking net parameters to download ")
 MSG_KEEP_CALM=$(gettext "please keep calm......... ")
@@ -63 +66 @@
                         if [ -f "$2"/"$NAME_FILE" ] ; then
                                 echo "$2/$NAME_FILE exists, you have to delete it before if you want to download it again"
-                                zenity --error --text "$2/$NAME_FILE exists, you have to delete it before if you want to download it again" $ZEN_BUTTON_OK
+                                zenity --error --text "$2/$NAME_FILE $MSG_EXISTS_FILE" $ZEN_BUTTON_OK
                                 exit 1
                         else
@@ -159 +162 @@
                 # Old instruction:
                 #( wget -O "$2"/"$3" "$1" 2>&1 | grep --line-buffered -o "[0-9]*%" | sed  -u -e 's/.* \([0-9]\+%\)\ \+\([0-9.]\+.\) \(.*\)/\1\n# Downloaded \1\ from "'$NAME'"  at \2\/s, ETA \3/' | zenity  --progress percentage=0 --auto-close --auto-kill --width 600 --title="Zero-Downloader-Helper" > /dev/null 2>&1  )|| rc=1
-                ( wget -O "$2"/"$3" "$1" 2>&1 |  sed -u 's/.*\ \([0-9]\+\)%\ \+\(.*\)$/\1\n'#$MSG_DONWLOADING' \1\% '$MSG_FROM' "'$NAME'" at \2/' | zenity  --progress percentage=0 --auto-close --auto-kill --width 600 --title="Zero-Downloader-Helper" --text="$MSG_STARTING '$NAME' in '$2'........." $ZEN_BUTTON_CANCEL_OK > /dev/null 2>&1  )|| rc=1
+                ( wget -O "$2"/"$3" "$1" 2>&1 |  sed -u 's/.*\ \([0-9]\+\)%\ \+\(.*\)$/\1\n'#$MSG_DONWLOADING' \1\% '$MSG_FROM' "'$NAME'" '$MSG_AT' \2/' | zenity  --progress percentage=0 --auto-close --auto-kill --width 600 --title="Zero-Downloader-Helper" --text="$MSG_STARTING '$NAME' $MSG_IN '$2'........." $ZEN_BUTTON_CANCEL_OK > /dev/null 2>&1  )|| rc=1
 
                 #Esta parte cancela el proceso del wget si se cancela la descarga en el zenity.