diff options
| author | madmonkey1907 <madfkingmonkey@gmail.com> | 2017-02-15 06:47:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 06:47:07 +0300 |
| commit | 8073c8bfc0a404aae7ed663baf5881a0e5959971 (patch) | |
| tree | 29090188f7f503734bb81a8ecd8c46d6dc906025 | |
| parent | 729f8d7554e3459284ad62fcce8c0d50d8ff8aac (diff) | |
| parent | f1583f63ac38baf8247fb35d3476eb56ec279939 (diff) | |
Merge pull request #20 from ClusterM/master
Bugfixes
| -rw-r--r-- | mod/hakchi/rootfs/bin/chmenu | 13 | ||||
| -rw-r--r-- | mod/hakchi/rootfs/etc/preinit.d/b0000_defines | 1 | ||||
| -rw-r--r-- | mod/hakchi/script/transfer | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/mod/hakchi/rootfs/bin/chmenu b/mod/hakchi/rootfs/bin/chmenu index 427982e..a448234 100644 --- a/mod/hakchi/rootfs/bin/chmenu +++ b/mod/hakchi/rootfs/bin/chmenu @@ -10,9 +10,9 @@ prev_code=$(cat "$state_file") echo Switching to menu $1 if [ "$1" == "000" ]; then - targetpath=$gamepath + targetpath=$rootfs$gamepath else - targetpath=$gamepath/$1 + targetpath=$rootfs$gamepath/$1 fi [ -d "$targetpath" ] || exit 1 @@ -20,10 +20,15 @@ echo $1 > "$state_file" echo New directory: $targetpath if [ ! -f "$targetpath/title.fnt" ]; then - ln -s "$gamepath/title.fnt" "$targetpath/title.fnt" + ln -s "$rootfs$gamepath/title.fnt" "$targetpath/title.fnt" fi if [ ! -f "$targetpath/copyright.fnt" ]; then - ln -s "$gamepath/copyright.fnt" "$targetpath/copyright.fnt" + ln -s "$rootfs$gamepath/copyright.fnt" "$targetpath/copyright.fnt" fi +pkill -KILL clover-mcp +pkill -KILL ReedPlayer-Clover + overmount_games + +clover-mcp diff --git a/mod/hakchi/rootfs/etc/preinit.d/b0000_defines b/mod/hakchi/rootfs/etc/preinit.d/b0000_defines index 5203e94..59c101e 100644 --- a/mod/hakchi/rootfs/etc/preinit.d/b0000_defines +++ b/mod/hakchi/rootfs/etc/preinit.d/b0000_defines @@ -1,6 +1,5 @@ modname=hakchi modpath=/$modname -[ -z "$mountpoint" ] && mountpoint=/ installpath=$mountpoint/var/lib/$modname firmwarepath=$installpath/firmware rootfs=$installpath/rootfs diff --git a/mod/hakchi/script/transfer b/mod/hakchi/script/transfer index 192c4ca..d92ab1a 100644 --- a/mod/hakchi/script/transfer +++ b/mod/hakchi/script/transfer @@ -11,9 +11,6 @@ source "$modpath/rootfs/etc/preinit" source_base "$modpath/rootfs/etc/preinit.d" source_config -# if we're running modified firmware -source "$preinitpath/p7070_firmware" - if [ -f "$preinit" ]; then echo $modname already installed mod_repair @@ -21,6 +18,9 @@ else mod_install fi +# if we're running modified firmware +source "$preinitpath/p7070_firmware" + local transferpath=$modpath/transfer [ -f "$transferpath/uninstall" ] && packs_uninstall $(cat "$transferpath/uninstall") |