Support for new launch.sh

Now installs everything to it's own folder that can be moved with a launch script inside.
This commit is contained in:
Nicole George 2020-02-10 00:48:41 -06:00 committed by GitHub
parent 8da04b334c
commit 289d1d113d

View File

@ -1,27 +1,28 @@
#!/bin/bash #!/bin/bash
export WINEPREFIX=$HOME/.local/share/wineprefixes/worlds export WORLDSDIR="$(dirname "$(readlink -f "$0")")/Worlds"
export WINEPREFIX="$WORLDSDIR/prefix"
export WINEARCH=win32 export WINEARCH=win32
export DIR="$WINEPREFIX/drive_c/Program Files/Worlds/WorldsPlayer by Worlds.com" export WORLDSINSTALL="$WINEPREFIX/drive_c/Program Files/Worlds"
export DIREXE="$DIR/run.exe"
start () { start () {
rm -rf "$DIR/downloads" rm -rf "$WORLDSDIR/downloads"
mkdir -p "$DIR/downloads"
if [ $1 == "fresh" ]; then if [ $1 == "fresh" ]; then
rm -rf $WINEPREFIX rm -rf $WORLDSDIR
fi fi
mkdir -p $WORLDSDIR
mkdir -p "$WORLDSDIR/downloads"
download download
} }
download () { download () {
cd "$DIR/downloads" cd "$WORLDSDIR/downloads"
wget https://github.com/Vencorr/Worlds-LinuxScript/blob/master/files.txt wget https://raw.githubusercontent.com/Vencorr/Worlds-LinuxScript/master/files.txt
wget -i files.txt wget -i files.txt
prefix prefix
} }
prefix () { prefix () {
echo "Installing components..." echo "Installing components..."
if ! [ -x "$(command -v winetricks)" ]; then if ! [ -x "$(command -v winetricks)" ]; then
echo "Error: 'winetricks' not found! Please add it to your path or install it via your package manager." echo "Error: 'winetricks' not found! Please add it to your path or install it via your package manager."
exit 1 exit 1
@ -32,15 +33,10 @@ prefix () {
} }
install () { install () {
cd "$DIR/downloads" cd "$WORLDSDIR/downloads"
echo "Downloading Java 6u45 Windows i586..." echo "Downloading Java 6u45 Windows i586..."
#wget --user=$(zenity --forms --title="Oracle Login" --text="An Oracle account is required to download the installer" --add-entry="Email") --password=$(zenity --forms --title="Oracle Login" --text="An Oracle account is required to download the installer" --add-password="Password") https://download.oracle.com/otn/java/jdk/6u45-b06/jre-6u45-windows-i586.exe
#if ! [ -f "$DIR/downloads/jre-6u45-windows-i586.exe" ]; then
# echo "JRE6 installer not found! Aborting!"
# exit 1
#fi
echo "Installing Worlds 1900. Please complete the setup." echo "Installing Worlds 1900. Please complete the setup."
wine jre-6u23-windows-i586-s /s wine jre-6u23-windows-i586-s /s
wine Worlds1900.exe /s wine Worlds1900.exe /s
killall run.exe Worlds1900.exe javaw.exe killall run.exe Worlds1900.exe javaw.exe
audio audio
@ -48,26 +44,16 @@ install () {
audio () { audio () {
echo "Setting up Audio prerequisites. Please complete the setups." echo "Setting up Audio prerequisites. Please complete the setups."
cd "$DIR/downloads" cd "$WORLDSDIR/downloads"
wine K-Lite_Codec_Pack_1535_Full.exe /s wine K-Lite_Codec_Pack_1535_Full.exe /s
wine LAVFilters-0.74.1-Installer.exe /s wine LAVFilters-0.74.1-Installer.exe /s
script script
} }
script () { script () {
WORLDSSCRIPT=$HOME/worlds.sh mv "$WORLDSDIR/downloads/launch.sh" "$WORLDSDIR/launch.sh"
rm $WORLDSSCRIPT chmod +x "$WORLDSDIR/launch.sh"
touch "$WORLDSSCRIPT" mv "$WINEPREFIX"/drive_c/Program\ Files/Worlds/WorldsPlayer\ by\ Worlds.com/* "$WINEPREFIX/drive_c/Program Files/Worlds/"
echo "#!/bin/sh" >> "$WORLDSSCRIPT"
echo "export WINEPREFIX=$WINEPREFIX" >> "$WORLDSSCRIPT"
echo "export WINEARCH=win32" >> "$WORLDSSCRIPT"
echo "export DIR=\"$DIR\"" >> "$WORLDSSCRIPT"
echo "cd \"$DIR\"" >> "$WORLDSSCRIPT"
echo "rm -rf \"\$DIR/cachedir\"" >> "$WORLDSSCRIPT"
echo "wine \"\$DIR/run.exe\" $*" >> "$WORLDSSCRIPT"
chmod +u $WORLDSSCRIPT
echo "A worlds startup script is available at $WORLDSSCRIPT!"
echo "Setup done!"
} }
start start