Skip to content

Commit

Permalink
Merge pull request #2 from joelghill/Issue1
Browse files Browse the repository at this point in the history
Resolving issue
  • Loading branch information
joelghill authored Jun 2, 2019
2 parents 7a49b4d + 9124242 commit c37bcd4
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 48 deletions.
72 changes: 36 additions & 36 deletions Install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,40 @@ echo -e " * 8: Exit"

read NUM
case $NUM in
1)
sudo bash ./Install_moonlight.sh
sudo bash ./Pair_moonlight.sh
sudo bash ./Install_moonlight_menu.sh
sudo bash ./Install_Scripts.sh
sudo bash ./Install_themes.sh
;;
2)
sudo bash ./Install_moonlight.sh
sudo bash ./Install.sh
;;
3)
sudo bash ./Pair_moonlight.sh
sudo bash ./Install.sh
;;
4)
sudo bash ./Install_moonlight_menu.sh
sudo bash ./Install.sh
;;
5)
sudo bash ./Install_Scripts.sh
sudo bash ./Install.sh
;;
1)
sudo bash ./Scripts/Install_moonlight.sh
sudo bash ./Scripts/Pair_moonlight.sh
sudo bash ./Scripts/Install_moonlight_menu.sh
sudo bash ./Scripts/Install_Scripts.sh
sudo bash ./Scripts/Install_themes.sh
;;
2)
sudo bash ./Scripts/Install_moonlight.sh
sudo bash ./Install.sh
;;
3)
sudo bash ./Scripts/Pair_moonlight.sh
sudo bash ./Install.sh
;;
4)
sudo bash ./Scripts/Install_moonlight_menu.sh
sudo bash ./Install.sh
;;
5)
sudo bash ./Scripts/Install_Scripts.sh
sudo bash ./Install.sh
;;
6)
sudo bash ./Install_themes.sh
sudo bash ./Install.sh
;;
7)
echo -e "\nRemoving all Moonlight launch scripts..."
rm -rf /home/pi/RetroPie/roms/moonlight
sudo bash ./Install.sh
;;
8)
exit 1
;;
*) echo "INVALID NUMBER!" ;;
esac
sudo bash ./Scripts/Install_themes.sh
sudo bash ./Install.sh
;;
7)
echo -e "\nRemoving all Moonlight launch scripts..."
rm -rf /home/pi/RetroPie/roms/moonlight
sudo bash ./Install.sh
;;
8)
exit 1
;;
*) echo "INVALID NUMBER!" ;;
esac
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ There is already a [solution available](https://github.com/TechWizTime/moonlight
2. I've found Steam BPM to be unreliable when used with RetroPie and I wanted something better.

## Minimum Requirements ##

* Raspberry Pi running Raspian Stretch (or latest RetroPie release)
* GPU: Desktop: GeForce GTX 650 or higher desktop GPU.
* CPU: Intel Core i3-2100 3.1GHz or AMD Athlon II X4 630 2.8 GHz or higher.
* System Memory: 4 GB or higher.
Expand Down
9 changes: 4 additions & 5 deletions Install_Scripts.sh → Scripts/Install_Scripts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ then
fi

mkdir -p /home/pi/RetroPie/roms/moonlight
chmod 775 /home/pi/RetroPie/roms/moonlight
chown pi:pi /home/pi/RetroPie/roms/moonlight

chmod -x+ Refresh.sh

/bin/cp ./Refresh.sh /home/pi/RetroPie/roms/moonlight/Refresh.sh
chmod a+x ./Scripts/Refresh.sh
/bin/cp ./Scripts/Refresh.sh /home/pi/RetroPie/roms/moonlight/Refresh.sh
/bin/cp ./GenerateGamesList.py /home/pi/RetroPie/roms/moonlight/GenerateGamesList.py

chmod 777 /home/pi/RetroPie/roms/moonlight

echo -e "Refresh script has been added to RetroPie\n"
echo -e "After loading RetroPie, use the \"Refresh\" rom listed in the Moonlight system.\n"
8 changes: 4 additions & 4 deletions Install_moonlight.sh → Scripts/Install_moonlight.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash

echo -e "\nAdding Moonlight to Sources List..."
if grep -q "deb http://archive.itimmer.nl/raspbian/moonlight jessie main" /etc/apt/sources.list; then

if grep -q "deb http://archive.itimmer.nl/raspbian/moonlight stretch main" /etc/apt/sources.list; then
echo -e "NOTE: Moonlight Source Exists - Skipping"
else
echo -e "Adding Moonlight to Sources List"
echo "deb http://archive.itimmer.nl/raspbian/moonlight jessie main" >> /etc/apt/sources.list
echo "deb http://archive.itimmer.nl/raspbian/moonlight stretch main" >> /etc/apt/sources.list
fi

echo -e "\nFetching and installing the GPG key....\n"
Expand All @@ -25,4 +25,4 @@ apt-get update -y

echo -e "\nInstalling Moonlight..."
apt-get install moonlight-embedded -y
echo -e "\nMoonlight Installed!"
echo -e "\nMoonlight Installed!"
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

echo -e "\nCreating Moonlight Menu for RetroPie..."

CONFIG=$(<./menu_config.txt)
DIRECTORY=/home/pi/.emulationstation/es_systems.cfg

Expand All @@ -15,6 +15,6 @@ echo -e "Copying Systems Config File"
cp /etc/emulationstation/es_systems.cfg $DIRECTORY

echo -e "Adding Moonlight to Systems"
sudo sed -i -e 's|</systemList>| <system>\n <name>steam</name>\n <fullname>Steam</fullname>\n <path>~/RetroPie/roms/moonlight</path>\n <extension>.sh .SH</extension>\n <command>bash %ROM%</command>\n <platform>pc</platform>\n <theme>moonlight</theme>\n </system>\n</systemList>|g' $DIRECTORY
sudo sed -i -e 's|</systemList>| <system>\n <name>moonlight</name>\n <fullname>Moonlight</fullname>\n <path>~/RetroPie/roms/moonlight</path>\n <extension>.sh .SH</extension>\n <command>bash %ROM%</command>\n <platform>pc</platform>\n <theme>moonlight</theme>\n </system>\n</systemList>|g' $DIRECTORY

echo -e "\nMoonlight menu added to RetroPie..."
File renamed without changes.
File renamed without changes.
0 Refresh.sh → Scripts/Refresh.sh
100644 → 100755
File renamed without changes.
File renamed without changes.

0 comments on commit c37bcd4

Please sign in to comment.