From 2965d1d5deeb0380e520facef89fa0f041dd7ed7 Mon Sep 17 00:00:00 2001 From: ejtejada Date: Wed, 3 Jun 2020 04:28:12 -0700 Subject: [PATCH 01/12] Verifying md5 compare to git version on my own fork --- setup | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/setup b/setup index ea24bda..7a1b12e 100755 --- a/setup +++ b/setup @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # --- Stops the script if errors are encountered. --- set -e @@ -6,11 +6,17 @@ 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" +ONLINEMASTER=$(curl -Ls https://github.com/ejtejada/FPM-Installer/raw/master/setup | md5sum) +CURRENTMASTER=$(md5sum setup) +##Cut these down to just 32 hex chars +ONLINEMASTER=${ONLINEMASTER:0:32} +CURRENTMASTER=${CURRENTMASTER:0:32} +echo $ONLINEMASTER +echo $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 "sh -c \"\$(curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup)" + echo "curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup" echo "" echo "to ensure you have the latest version!" exit From db83c9b7ba4f878c3b5578e5317529766e60f6ea Mon Sep 17 00:00:00 2001 From: ejtejada Date: Wed, 3 Jun 2020 04:29:11 -0700 Subject: [PATCH 02/12] Fixing the wrong case --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 7a1b12e..3c216e6 100755 --- a/setup +++ b/setup @@ -13,7 +13,7 @@ ONLINEMASTER=${ONLINEMASTER:0:32} CURRENTMASTER=${CURRENTMASTER:0:32} echo $ONLINEMASTER echo $CURRENTMASTER -if [ -f "./setup" ] && [ "$ONLINEMASTER" = "$CURRENTMASTER" ]; then +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 "curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup" From ac8c8fe31c4b814b6c089a9b83af3dd347cdd254 Mon Sep 17 00:00:00 2001 From: ejtejada Date: Wed, 3 Jun 2020 04:48:19 -0700 Subject: [PATCH 03/12] Adding Ubuntu dependencies from Dolphin wiki, as well as extra dependencies explicitly. --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 18f92b1..51d6165 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,9 @@ If running Ubuntu 20.04 or other distros based on it you must install this dep a You must also tell the installer you are running it as well. ## Other Deps +For Ubuntu 16.04 and greater: + +`sudo apt install curl md5sum cmake pkg-config git libao-dev libasound2-dev libavcodec-dev libavformat-dev libbluetooth-dev libenet-dev libgtk2.0-dev liblzo2-dev libminiupnpc-dev libopenal-dev libpulse-dev libreadline-dev libsfml-dev libsoil-dev libsoundtouch-dev libswscale-dev libusb-1.0-0-dev libwxbase3.0-dev libwxgtk3.0-dev libxext-dev libxrandr-dev portaudio19-dev zlib1g-dev libudev-dev libevdev-dev "libpolarssl-dev|libmbedtls-dev" libcurl4-openssl-dev libegl1-mesa-dev libpng-dev qtbase5-private-dev` 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. @@ -27,7 +30,7 @@ See [attached README, written by fletchers#4892](../other_distros/NixOS/INSTALL. `sudo eopkg it -c system.devel` -`sudo eopkg it libgtk-2-devel libgtk-3-devel wxwidgets-devel libsm-devel gtest-devel llvm-devel lzo-devel mbedtls-devel miniupnpc-devel libxrandr-devel libxi-devel alsa-lib-devel bluez-devel mesalib-devel curl-devel enet-devel libevdev-devel pulseaudio-devel libusb-devel openal-soft-devel portaudio-devel sdl2-devel SFML-devel soundtouch-devel git cmake pkg-config gcc readline-devel libxext-devel libao-devel` +`sudo eopkg it libgtk-2-devel libgtk-3-devel wxwidgets-devel libsm-devel gtest-devel llvm-devel lzo-devel mbedtls-devel miniupnpc-devel libxrandr-devel libxi-devel alsa-lib-devel bluez-devel mesalib-devel curl-devel enet-devel libevdev-devel pulseaudio-devel libusb-devel openal-soft-devel portaudio-devel sdl2-devel SFML-devel soundtouch-devel git cmake pkg-config gcc readline-devel libxext-devel libao-devel md5sum` ## Dependencies Optional @@ -51,14 +54,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)" +```curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup && ./setup ``` If a different version is needed (e.g. not SL default), edit the script and replace the desired variables. @@ -87,4 +89,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) From 355a84788df337fdea5d1bdcf71a8fed6a119a9e Mon Sep 17 00:00:00 2001 From: ejtejada Date: Wed, 3 Jun 2020 04:54:02 -0700 Subject: [PATCH 04/12] Changing online master back to Birdthulu's fork for md5 comparison --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 3c216e6..3d4a39c 100755 --- a/setup +++ b/setup @@ -6,7 +6,7 @@ set -e # # --- Based Off of/Ripped from https://github.com/FasterMelee/FasterMelee-installer/ Thank you Faster Melee Team! # --- -ONLINEMASTER=$(curl -Ls https://github.com/ejtejada/FPM-Installer/raw/master/setup | md5sum) +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=${ONLINEMASTER:0:32} From 23133450bf9532225058b19a423e7dc3e805f32d Mon Sep 17 00:00:00 2001 From: ejtejada Date: Tue, 9 Jun 2020 19:21:38 -0700 Subject: [PATCH 05/12] Making reviewed changes, testing on my own branch first --- README.md | 4 +--- setup | 9 +++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 51d6165..9f2e47f 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,7 @@ If running Ubuntu 20.04 or other distros based on it you must install this dep a You must also tell the installer you are running it as well. ## Other Deps -For Ubuntu 16.04 and greater: -`sudo apt install curl md5sum cmake pkg-config git libao-dev libasound2-dev libavcodec-dev libavformat-dev libbluetooth-dev libenet-dev libgtk2.0-dev liblzo2-dev libminiupnpc-dev libopenal-dev libpulse-dev libreadline-dev libsfml-dev libsoil-dev libsoundtouch-dev libswscale-dev libusb-1.0-0-dev libwxbase3.0-dev libwxgtk3.0-dev libxext-dev libxrandr-dev portaudio19-dev zlib1g-dev libudev-dev libevdev-dev "libpolarssl-dev|libmbedtls-dev" libcurl4-openssl-dev libegl1-mesa-dev libpng-dev qtbase5-private-dev` 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. @@ -30,7 +28,7 @@ See [attached README, written by fletchers#4892](../other_distros/NixOS/INSTALL. `sudo eopkg it -c system.devel` -`sudo eopkg it libgtk-2-devel libgtk-3-devel wxwidgets-devel libsm-devel gtest-devel llvm-devel lzo-devel mbedtls-devel miniupnpc-devel libxrandr-devel libxi-devel alsa-lib-devel bluez-devel mesalib-devel curl-devel enet-devel libevdev-devel pulseaudio-devel libusb-devel openal-soft-devel portaudio-devel sdl2-devel SFML-devel soundtouch-devel git cmake pkg-config gcc readline-devel libxext-devel libao-devel md5sum` +`sudo eopkg it libgtk-2-devel libgtk-3-devel wxwidgets-devel libsm-devel gtest-devel llvm-devel lzo-devel mbedtls-devel miniupnpc-devel libxrandr-devel libxi-devel alsa-lib-devel bluez-devel mesalib-devel curl-devel enet-devel libevdev-devel pulseaudio-devel libusb-devel openal-soft-devel portaudio-devel sdl2-devel SFML-devel soundtouch-devel git cmake pkg-config gcc readline-devel libxext-devel libao-devel` ## Dependencies Optional diff --git a/setup b/setup index 3d4a39c..a0b729c 100755 --- a/setup +++ b/setup @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # --- Stops the script if errors are encountered. --- set -e @@ -9,14 +9,15 @@ set -e 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=${ONLINEMASTER:0:32} -CURRENTMASTER=${CURRENTMASTER:0:32} + +ONLINEMASTER=$(echo $ONLINEMASTER | cut -c -32) +CURRENTMASTER=$(echo $CURRENTMASTER | cut -c -32) echo $ONLINEMASTER echo $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 "curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup" + echo "curl -Ls https://github.com/ejtejada/FPM-Installer/raw/master/setup" echo "" echo "to ensure you have the latest version!" exit From d2d7395dc32639efdd306d1d0f6fb7147d9dceac Mon Sep 17 00:00:00 2001 From: ejtejada Date: Tue, 9 Jun 2020 19:24:08 -0700 Subject: [PATCH 06/12] Fixing typo --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index a0b729c..ffe3806 100755 --- a/setup +++ b/setup @@ -6,7 +6,7 @@ set -e # # --- Based Off of/Ripped from https://github.com/FasterMelee/FasterMelee-installer/ Thank you Faster Melee Team! # --- -ONLINEMASTER=$(curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup | md5sum) +ONLINEMASTER=$(curl -Ls https://github.com/ejtejada/FPM-Installer/raw/master/setup | md5sum) CURRENTMASTER=$(md5sum setup) ##Cut these down to just 32 hex chars From 5c47923394b04de0934bdbdae8c3ea85d3a85ed4 Mon Sep 17 00:00:00 2001 From: ejtejada Date: Tue, 9 Jun 2020 19:31:32 -0700 Subject: [PATCH 07/12] Changing pull version to checking with Birdthulu master --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index ffe3806..a0b729c 100755 --- a/setup +++ b/setup @@ -6,7 +6,7 @@ set -e # # --- Based Off of/Ripped from https://github.com/FasterMelee/FasterMelee-installer/ Thank you Faster Melee Team! # --- -ONLINEMASTER=$(curl -Ls https://github.com/ejtejada/FPM-Installer/raw/master/setup | md5sum) +ONLINEMASTER=$(curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup | md5sum) CURRENTMASTER=$(md5sum setup) ##Cut these down to just 32 hex chars From d03a42888ebf41e72d7e48ae3fd48e553f265ae7 Mon Sep 17 00:00:00 2001 From: ejtejada Date: Tue, 9 Jun 2020 19:32:46 -0700 Subject: [PATCH 08/12] Removing any calls to my own branch --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index a0b729c..15cb2f3 100755 --- a/setup +++ b/setup @@ -17,7 +17,7 @@ echo $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 "curl -Ls https://github.com/ejtejada/FPM-Installer/raw/master/setup" + echo "curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup" echo "" echo "to ensure you have the latest version!" exit From 3fd45d8e29ed29cdb9410d10a8bd2e11215a9b78 Mon Sep 17 00:00:00 2001 From: ejtejada Date: Tue, 9 Jun 2020 19:58:13 -0700 Subject: [PATCH 09/12] Fixing To use: --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 9f2e47f..4b9f069 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,7 @@ SD card file size 2Gb zipped to 1.6Gb ## To use: -```curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup && ./setup -``` +`curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup && ./setup` If a different version is needed (e.g. not SL default), edit the script and replace the desired variables. From d1baad25b822722e5da8f7da867b38af2afe5629 Mon Sep 17 00:00:00 2001 From: ejtejada Date: Fri, 19 Jun 2020 16:47:33 -0700 Subject: [PATCH 10/12] Testing fixes requiring wget on my branch --- README.md | 2 +- setup | 38 ++++++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 4b9f069..8a46741 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ SD card file size 2Gb zipped to 1.6Gb ## To use: -`curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup && ./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. diff --git a/setup b/setup index 15cb2f3..c7d06dc 100755 --- a/setup +++ b/setup @@ -6,21 +6,31 @@ set -e # # --- Based Off of/Ripped from https://github.com/FasterMelee/FasterMelee-installer/ Thank you Faster Melee Team! # --- -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 $ONLINEMASTER -echo $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 "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/ejtejada/FPM-Installer/raw/master/setup | md5sum) + CURRENTMASTER=$(md5sum setup) + + #If they don't have the setup file, skip the hash check and just continue the script + + ##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. --- From 90da3ab7b8ffca444a849cc2330e570518996867 Mon Sep 17 00:00:00 2001 From: ejtejada Date: Fri, 19 Jun 2020 16:50:51 -0700 Subject: [PATCH 11/12] Reverting hashcheck back to Birdthulu --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index c7d06dc..7bc7595 100755 --- a/setup +++ b/setup @@ -10,7 +10,7 @@ set -e #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/ejtejada/FPM-Installer/raw/master/setup | md5sum) + ONLINEMASTER=$(curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup | md5sum) CURRENTMASTER=$(md5sum setup) #If they don't have the setup file, skip the hash check and just continue the script From 6500e1205278a7f96f6b09f9f0b42b116ce7ffb9 Mon Sep 17 00:00:00 2001 From: ejtejada Date: Fri, 19 Jun 2020 17:12:06 -0700 Subject: [PATCH 12/12] Cleaning up comments --- setup | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup b/setup index 7bc7595..082c2b9 100755 --- a/setup +++ b/setup @@ -13,10 +13,7 @@ then ONLINEMASTER=$(curl -Ls https://github.com/Birdthulu/FPM-Installer/raw/master/setup | md5sum) CURRENTMASTER=$(md5sum setup) - #If they don't have the setup file, skip the hash check and just continue the script - ##Cut these down to just 32 hex chars - ONLINEMASTER=$(echo $ONLINEMASTER | cut -c -32) CURRENTMASTER=$(echo $CURRENTMASTER | cut -c -32) echo "Online Version:" $ONLINEMASTER