[runescape] 05/08: Updated script

[Carlos Donizete Froes]

This is an automated email from the git hooks/post-receive script.

coringao-guest pushed a commit to branch master
in repository runescape.

commit bb38ad5f6915fee0f93494d46cea2cb9bc0d5ccb
Author: Carlos Donizete Froes <coringao at riseup.net>
Date:   Wed Oct 25 00:27:36 2017 -0200

    Updated script
    
    Signed-off-by: Carlos Donizete Froes <coringao at riseup.net>
---
 src/runescape.sh | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/runescape.sh b/src/runescape.sh
index ce8d80a..e4f2c5c 100644
--- a/src/runescape.sh
+++ b/src/runescape.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 #
-#	Copyright (C) 2016 Carlos Donizete Froes <coringao at riseup.net>
+#	Copyright (C) 2016-2017 Carlos Donizete Froes <coringao at riseup.net>
 #	Use of this script is governed by a BSD 2-clause license
 #	that can be found in the LICENSE file.
 #	Source code and contact info at https://github.com/coringao/runescape
 #
 # Game:     Runescape
-# Date:     July/2016
+# Date:     October/2017
 #
 # Download Mac Client
 LINK="https://www.runescape.com/downloads/runescape.dmg"
@@ -14,30 +14,37 @@ LINK="https://www.runescape.com/downloads/runescape.dmg"
 # Directory Runescape
 GAME="$HOME/jagexcache/runescape/bin"
 
-# Temporary directory used by the script: its contents will be deleted.
+# Temporary directory will be created and after installation this directory will be deleted
 TEMP="$HOME/.rs-temp"
 
 if [ ! -d $GAME ]; then
 	mkdir -p $GAME
 	mkdir $TEMP
-	cd $TEMP	
-	wget -c -q $LINK
+	cd $TEMP
+
+# Downloading the file in the temporary directory	
+	LANG=C wget $LINK --progress=bar:force:noscroll --limit-rate 100k 2>&1 \
+	| stdbuf -i0 -o0 -e0 tr '>' '\n' \
+	| stdbuf -i0 -o0 -e0 sed -rn 's/^.*\<([0-9]+)%\[.*$/\1/p' \
+	| zenity --progress --auto-close --auto-kill 2>/dev/null
+
+# Uncompressing the file in the temporary directory
 	7z e runescape.dmg > /dev/null
-	7z e 0.hfs -y > /dev/null
 	mv jagexappletviewer.jar $GAME
         cd
 	rm -rf $TEMP
 fi
-SELECT=`zenity --title=RuneScape --list \
---window-icon=/usr/share/pixmaps/runescape.xpm \
+
+# Running the language selection window to start the game
+LANG=C SELECT=`zenity --title=RuneScape --list \
 --width=250 --height=250 --radiolist --column "AT" \
 --column "Select the language" \
 	TRUE  "English" \
 	FALSE "French" \
 	FALSE "German"\
 	FALSE "Portuguese"\
-	FALSE "Spanish"`
-	   
+	FALSE "Spanish" 2>/dev/null `
+
 if echo "$SELECT" | grep $"English"; then
 	java -Xmx512m -Xms512m -Djava.class.path="$GAME/jagexappletviewer.jar" \
 	-Dcom.jagex.config=http://www.runescape.com/k=3/l=en/jav_config.ws \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/runescape.git