diff --git a/README.md b/README.md index 18f92b1..8a46741 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ You must also tell the installer you are running it as well. ## Other Deps + For most users (including Fedora 24+), see [this page](https://wiki.dolphin-emu.org/index.php?title=Building_Dolphin_on_Linux) for an easy to install list of dependencies; otherwise, see below. ### NixOS: @@ -51,15 +52,13 @@ SD card file size 2Gb zipped to 1.6Gb ## Instructions: (READ FULLY BEFORE FOLLOWING) 1. Install necessary dependcies listed using guide above. Don't forget that optional deps will bring fast downloads. -2. Use install script to obtain FPP -3. Move Brawl into FasterProjectPlus/bin/Games directory -4. Run the game by opening the .elf file in dolphin +2. Use install script to obtain FPP. +3. Move Brawl into FasterProjectPlus/bin/Games directory. +4. Run the game by opening the .elf file in Ishiiruka. ## To use: -```sh -sh -c "$(curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup)" -``` +`wget https://github.com/Birdthulu/FPM-Installer/raw/master/setup && chmod +x setup && ./setup` If a different version is needed (e.g. not SL default), edit the script and replace the desired variables. @@ -87,4 +86,4 @@ They thank the following people so it felt appropriate to thank them here as wel ### Faster Melee on Linux: Want to play Melee on linux? -[Check out the FasterMelee team's installer here!](https://github.com/FasterMelee/FasterMelee-installer) \ No newline at end of file +[Check out the FasterMelee team's installer here!](https://github.com/FasterMelee/FasterMelee-installer) diff --git a/setup b/setup index ea24bda..082c2b9 100755 --- a/setup +++ b/setup @@ -7,13 +7,27 @@ set -e # --- Based Off of/Ripped from https://github.com/FasterMelee/FasterMelee-installer/ Thank you Faster Melee Team! # --- -if [ -f "./setup" ] && [ -z "${IN_NIX_SHELL++}" ]; then - echo "You are running a hosted copy of the script. Please *delete the local file 'setup'* and run" - echo "" - echo "sh -c \"\$(curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup)" - echo "" - echo "to ensure you have the latest version!" - exit +#If they don't have the setup file, skip the hash check and just continue the script +if [ -e setup ] +then + ONLINEMASTER=$(curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup | md5sum) + CURRENTMASTER=$(md5sum setup) + + ##Cut these down to just 32 hex chars + ONLINEMASTER=$(echo $ONLINEMASTER | cut -c -32) + CURRENTMASTER=$(echo $CURRENTMASTER | cut -c -32) + echo "Online Version:" $ONLINEMASTER + echo "Your Version:" $CURRENTMASTER + if [ -f "./setup" ] && [ "$ONLINEMASTER" != "$CURRENTMASTER" ]; then + echo "You are running a out of date copy of this install script. Please delete the local file 'setup' and run" + echo "" + echo "wget https://github.com/Birdthulu/FPM-Installer/raw/master/setup && chmod +x setup && ./setup" + echo "" + echo "to ensure you have the latest version!" + exit + fi +else + echo "No setup script on disk found. Runing script anyway." fi # --- Attempts to determine the number of cores in the CPU. ---