software/region variables

4 files changed, 19 insertions, 7 deletions

diff --git a/mod/hakchi/init b/mod/hakchi/init
index 3240667..cd1ab8d 100644
--- a/mod/hakchi/init
+++ b/mod/hakchi/init
@@ -11,6 +11,8 @@ local rootfs=""
 local squashfs=""
 local preinit=""
 local preinitpath=""
+local sftype=""
+local sfregion=""
 local gamepath=""
 local temppath="/tmp"
 
diff --git a/mod/hakchi/rootfs/etc/preinit b/mod/hakchi/rootfs/etc/preinit
index 34a26fe..1a4eab6 100644
--- a/mod/hakchi/rootfs/etc/preinit
+++ b/mod/hakchi/rootfs/etc/preinit
@@ -3,7 +3,7 @@ rand(){
 }
 
 source_parts(){
-  [ -z "$temppath" ] && local temppath="/tmp"
+  [ -z "$temppath" ] && temppath="/tmp"
   mkdir -p "$temppath"
   local script="$temppath/script_$(rand)"
   rm -f "$script"
diff --git a/mod/hakchi/rootfs/etc/preinit.d/b0000_defines b/mod/hakchi/rootfs/etc/preinit.d/b0000_defines
index 1f76521..3aeee77 100644
--- a/mod/hakchi/rootfs/etc/preinit.d/b0000_defines
+++ b/mod/hakchi/rootfs/etc/preinit.d/b0000_defines
@@ -1,12 +1,15 @@
 setGamepath(){
+  sftype="nes"
+  sfregion="usa"
+  [ "$(cat "$mountpoint/etc/clover/boardtype")" == "dp-shvc" ] && sftype="snes"
+  [ "$(cat "$mountpoint/etc/clover/REGION")" == "JPN" ] && sfregion="jpn"
+
   local feck="$mountpoint/var/lib/clover/profiles/0/home-menu/save/system-save.json"
-  if [ -f "$mountpoint/etc/clover/version/canoe" ]; then
-#    echo "SNES gamepath"
+  if [ "$sftype" == "snes" ]; then
     gamepath="/usr/share/games"
     [ -f "$feck" ] && mv -f "$feck" "$feck.nes"
     [ -d "$feck.snes" ] && rm -rf "$feck" && mv "$feck.snes" "$feck"
   else
-#    echo "NES gamepath"
     gamepath="/usr/share/games/nes/kachikachi"
     [ -d "$feck" ] && rm -rf "$feck.snes" && mv "$feck" "$feck.snes"
     [ -f "$feck.nes" ] && mv -f "$feck.nes" "$feck"
@@ -22,6 +25,9 @@ rootfs="$installpath/rootfs"
 squashfs="$installpath/squashfs"
 preinit="$rootfs/etc/preinit"
 preinitpath="$preinit.d"
+sftype=""
+sfregion=""
 gamepath=""
-setGamepath
 temppath="/tmp"
+
+setGamepath
diff --git a/mod/hakchi/rootfs/etc/preinit.d/b0010_functions b/mod/hakchi/rootfs/etc/preinit.d/b0010_functions
index 6dbdca4..df71aa6 100644
--- a/mod/hakchi/rootfs/etc/preinit.d/b0010_functions
+++ b/mod/hakchi/rootfs/etc/preinit.d/b0010_functions
@@ -84,8 +84,7 @@ load_firmware(){
   [ -z "$(mount | grep -F loop0)" ] || return 1
 
   local firmware="$mountpoint$cfg_firmware"
-  if checkFirmware "$firmware"; then
-  else
+  if ! checkFirmware "$firmware"; then
     [ -d "$firmwarepath" ] || return 0
     firmware="$(find "$firmwarepath" -type f -name "*.hsqs" | sort | head -n 1)"
   fi
@@ -214,3 +213,8 @@ uistart(){
 gameover(){
   poweroff
 }
+
+printSoftwareInfo(){
+  echo "software=$sftype"
+  echo "region=$sfregion"
+}