diff --git a/README.md b/README.md index 657a756..b619701 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ $ ./worlds-installer.sh All worlds content should be in a folder named "Worlds" in the same location your install script resides. A launch script named `launch.sh` should be in it's root. This is the script that you should run. Now you can make a desktop entry pointing to that script and enjoy Worlds. -![](https://github.com/Vencorr/Worlds-LinuxScript/blob/master/image.png) +![](https://github.com/Vencorr/Worlds-LinuxScript/blob/master/launcher.png) -![](https://i.imgur.com/1jjA7WM.png) +![](https://github.com/Vencorr/Worlds-LinuxScript/blob/master/app.png) -*WorldsPlayer is property of Worlds Inc. I do not own WorldsPlayer and these scripts in no way modify the client.* +*WorldsPlayer and it's logo is property of Worlds Inc. and all rights belong to them.* diff --git a/app.png b/app.png new file mode 100644 index 0000000..6d16c90 Binary files /dev/null and b/app.png differ diff --git a/image.png b/image.png deleted file mode 100644 index f0e3c18..0000000 Binary files a/image.png and /dev/null differ diff --git a/launch.sh b/launch.sh index ad89768..3ed9f53 100755 --- a/launch.sh +++ b/launch.sh @@ -44,7 +44,8 @@ main() { launch && tail -F "$WORLDSINSTALL/Gamma.Log.open" | zenity --text-info --auto-scroll --height=480 --width=768 --title="$TITLE - Log" --window-icon="$WORLDSDIR/icon.png" --text="Gamma.Log.open" ;; 'Worlds Organizer') if [[ ! -f "$WORLDSDIR/WorldsOrganizer.jar" ]]; then - wget -O"$WORLDSDIR/WorldsOrganizer.jar" "https://wirlaburla.site/projects/WorldsOrganizer/dw/0.9.64/WorldsOrganizer-linux.jar" + zenity --info --text="The launcher will now download WorldsOrganizer using wget and run it." --width=280 --height=40 --title="$TITLE - WorldsOrganizer" --window-icon="$WORLDSDIR/icon.png" + wget -O"$WORLDSDIR/WorldsOrganizer.jar" "https://wirlaburla.com/WorldsOrganizer/dw/0.9.64/WorldsOrganizer-linux.jar" | zenity --progress --no-cancel --title="$TITLE - Downloading WorldsOrganizer" --width=300 --height=50 --auto-close --auto-kill fi java -jar "$WORLDSDIR/WorldsOrganizer.jar" main ;; @@ -60,19 +61,14 @@ main() { killw main ;; 'Update' ) - update ;; + update | zenity --progress --no-cancel --title="$TITLE - Updating" --width=300 --height=50 --auto-close --auto-kill;; 'Open Github page' ) xdg-open "https://github.com/Vencorr/Worlds-LinuxScript" main ;; esac - if [ "$?" != 0 ] - then - exit - fi } launch () { - source "$WORLDSDIR/wrldscmd" WORLDSNEW="WorldsPlayer.exe" WORLDSOLD="run.exe" WORLDSLEGACY="run.bat" @@ -83,6 +79,10 @@ launch () { else $WINE cmd /c "$WORLDSINSTALL/$WORLDSLEGACY" fi + + if [ $? -ne 0 ]; then + launch + fi } settings () { @@ -135,7 +135,6 @@ settings () { echo "export WINE=\"$WINE\"" >> "$WORLDSDIR/wrldslinux" echo "export WINEPREFIX=\"$WINEPREFIX\"" >> "$WORLDSDIR/wrldslinux" echo "export WORLDSINSTALL=\"$WORLDSINSTALL\"" >> "$WORLDSDIR/wrldslinux" - echo "export SETTHEME=\"$SETTHEME\"" >> "$WORLDSDIR/wrldslinux" echo "source \"$WORLDSDIR/wrldscmd\"" >> "$WORLDSDIR/wrldslinux" } @@ -195,7 +194,7 @@ update () { } killw () { - killall WorldsPlayer.exe run.exe javaw.exe jrew.exe run.bat | zenity --progress --no-buttons --title="$TITLE - Killing Processes" --width=300 --height=50 --auto-close --auto-kill + killall WorldsPlayer.exe run.exe javaw.exe jrew.exe run.bat | zenity --progress --no-cancel --title="$TITLE - Killing Processes" --width=300 --height=50 --auto-close --auto-kill zenity --error --text="Killed all possible running processes of Worlds." --width=240 --height=40 --title="$TITLE - Kill" --window-icon="$WORLDSDIR/icon.png" } diff --git a/launcher.png b/launcher.png new file mode 100644 index 0000000..41454b9 Binary files /dev/null and b/launcher.png differ