Merge pull request #76 from JeodC/solarusruntime

Update Ports: Solarus

ports/hallowseve/Hallow's Eve.sh

@@ -13,22 +13,46 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/hallowseve"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
+export LIBGL_ES=2
+export LIBGL_GL=21
+export LIBGL_FB=4
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "hallowseve.gptk" & 
+$GPTOKEYB "$runtime" -c "hallowseve.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0

ports/hallowseve/README.md

@@ -1,5 +1,5 @@
 ## Installation
-Buy the game from https://maxatrillionator.itch.io/hallows-eve and place the .solarus file in the hallowseve/game folder.
+Buy the game from https://maxatrillionator.itch.io/hallows-eve and place the .solarus file in the `ports/hallowseve` folder.
 
 ## Default Gameplay Controls
 | Button | Action |

ports/hallowseve/port.json

@@ -12,15 +12,15 @@
       "Jeod"
     ],
     "desc": "On Halloween, the barrier between human world and the spirit world thins. The spirits play tricks, the dead can be seen, and monsters can run their human world errands.\n\nSet in the 90s, play as Ichabod, a pumpkin man who uses his chance to enter the human world to try and rent Jurassic Park from the video store. Unfortunately, the only copy has been rented by a teen who’s brought a witch’s curse upon the town.\n\nGameplay is inspired by the classics and the modern classics — a Zeldalike sense of exploration, with the tight, fast combat of Hyper Light Drifter. All soaked in a charming pixel art atmosphere and a dumb sense of humor. Playtime is around 1-2 hours.",
-    "inst": "Buy the game from https://maxatrillionator.itch.io/hallows-eve and place the .solarus file in the hallowseve/game folder.",
+    "inst": "Buy the game from https://maxatrillionator.itch.io/hallows-eve and place the .solarus file in the ports/hallowseve folder.",
     "genres": [
       "action",
 	  "adventure"
     ],
-    "image": "hallowseve.screenshot.png",
+    "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
+    "runtime": "solarus-1.6.5",
     "reqs": []
   }
 }

ports/oceansheart/Ocean's Heart.sh

@@ -13,26 +13,46 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/oceansheart"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
 export LIBGL_ES=2
 export LIBGL_GL=21
 export LIBGL_FB=4
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "oceansheart.gptk" & 
-SDL_GAMECONTROLLERCONFIG="$sdl_controllerconfig"
+$GPTOKEYB "$runtime" -c "oceansheart.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0

ports/oceansheart/README.md

@@ -1,5 +1,5 @@
 ## Installation
-Buy the game from GOG or Steam and place the data.solarus file in the oceansheart/game folder.
+Buy the game from GOG or Steam and place the data.solarus file in the `ports/oceansheart` folder.
 
 ## Default Gameplay Controls
 | Button | Action |

ports/oceansheart/port.json

@@ -12,15 +12,15 @@
       "Jeod"
     ],
     "desc": "When pirates attacked Limestone Island, it fell to Tilia’s father to go after them and rescue the young woman they kidnapped. When he hasn’t returned six months later, Tilia decides it’s up to her to track down her dad and find out what went wrong.\n\nPlay as Tilia as she travels across an archipelago full of pirate forts, forgotten magic, abominable beasts, and a diverse cast of people trying to find their place in it all. As Tilia follows her dad’s trail, she becomes entrangled in the pirates’ plot to use an old magic to control the ocean. And maybe along the way, she’ll play in a tick-tack-toe championship, prevent an art heist, or impresonate a piano tuner. It’s a large world full of secrets, dangers, and quirky wierdos for you to explore.",
-    "inst": "Buy the game from GOG or Steam and place the data.solarus file in the oceansheart/game folder.",
+    "inst": "Buy the game from GOG or Steam and place the data.solarus file in the ports/oceansheart folder.",
     "genres": [
       "action",
 	  "adventure"
     ],
-    "image": "oceansheart.screenshot.png",
+    "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
+    "runtime": "solarus-1.6.5",
     "reqs": []
   }
 }

ports/stop_the_eggspress/port.json

@@ -2,7 +2,7 @@
   "version": 2,
   "name": "stop_the_eggspress.zip",
   "items": [
-    "Stop The Egg Eggspress.sh",
+    "Stop The Eggspress.sh",
     "stop_the_eggspress"
   ],
   "items_opt": [],

ports/tunics/README.md

@@ -1,5 +1,5 @@
 ## Installation
-Download game from https://solarus-games.org/games/tunics/ and put the .solarus file in tunics!/game.
+Download game from https://solarus-games.org/games/tunics/ and put the .solarus file in `ports/tunics`.
 
 ## Default Gameplay Controls
 | Button | Action |

ports/tunics/Tunics!.sh

@@ -13,22 +13,43 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/tunics"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "tunics.gptk" & 
+$GPTOKEYB "$runtime" -c "tunics.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0

ports/tunics/port.json

@@ -1,9 +1,9 @@
 {
   "version": 2,
-  "name": "tunics.zip",
+  "name": "tunics!.zip",
   "items": [
     "Tunics!.sh",
-    "tunics/"
+    "tunics!/"
   ],
   "items_opt": [],
   "attr": {
@@ -12,15 +12,15 @@
       "Jeod"
     ],
     "desc": "Tunics! is a Rogue-like Legend of Zelda quest. It means it’s only dungeons, and they are randomly generated. Moreover, once you’re dead, you’ll have to restart from the beginning, losing all your improvements (weapons, health, etc). It should be considered a well-polished proof-of-concept.",
-    "inst": "Download game from https://solarus-games.org/games/tunics/ and put the .solarus file in tunics!/game.",
+    "inst": "Download game from https://solarus-games.org/games/tunics/ and put the .solarus file in the ports/tunics folder.",
     "genres": [
       "action",
 	  "adventure"
     ],
     "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
+    "runtime": "solarus-1.6.5",
     "reqs": []
   }
 }

ports/yarntown/README.md

@@ -1,5 +1,5 @@
 ## Installation
-Download game from https://solarus-games.org/games/yarntown/ and put the .solarus file in yarntown/game.
+Download game from https://solarus-games.org/games/yarntown/ and put the .solarus file in `ports/yarntown`.
 
 ## Default Gameplay Controls
 | Button | Action |
@@ -12,9 +12,6 @@ Download game from https://solarus-games.org/games/yarntown/ and put the .solaru
 |Y|Heal|
 |START|Pause & Save|
 
-## Notes
-This game will boot ok RK3326 chips, but performance will be low in Central Yarntown. It's still somewhat playable, but nowhere near smooth. Play at your own risk.
-
 ## Thanks
 Cebion  
 Max Mraz  

ports/yarntown/Yarntown.sh

@@ -13,22 +13,43 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/yarntown"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "yarntown.gptk" & 
+$GPTOKEYB "$runtime" -c "yarntown.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0

ports/yarntown/port.json

@@ -9,19 +9,17 @@
   "attr": {
     "title": "Yarntown",
     "porter": [
-      "Jeod"
+      "Jeod",
     ],
     "desc": "You’ve come on the night of the hunt. The streets of this cursed, gothic town are overrun with beasts, and what has become of the men who tried to hunt them before. Explore the twisting roads, go toe to toe with powerful foes, and uncover Yarntown’s dark secrets.",
-    "inst": "Download game from https://solarus-games.org/games/yarntown/ and put the .solarus file in yarntown/game.",
+    "inst": "Download game from https://solarus-games.org/games/yarntown/ and put the .solarus file in ports/yarntown.",
     "genres": [
-      "action"
+      "action",
     ],
-    "image": "yarntown.screenshot.png",
+    "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
-    "reqs": [
-		"power"
-	]
+    "runtime": "solarus-1.6.5",
+    "reqs": []
   }
 }

ports/zelda-bookofmudora/README.md

@@ -1,5 +1,5 @@
 ## Installation
-Download the game from https://solarus-games.org/games/the-legend-of-zelda-book-of-mudora/ and put in the zelda-bookofmudora/game folder.
+Download the game from https://solarus-games.org/games/the-legend-of-zelda-book-of-mudora/ and put in the `ports/zelda-bookofmudora` folder.
 
 ## Default Gameplay Controls
 | Button | Action |