diff options
author | Daniel Radtke <daniel.radtke@gmail.com> | 2017-11-19 03:33:20 +0300 |
---|---|---|
committer | Daniel Radtke <daniel.radtke@gmail.com> | 2017-11-19 03:33:20 +0300 |
commit | 9e13491d1477e8c0a85a376ae8d4d784287dbb96 (patch) | |
tree | ea216a85e24bcf2f5f486dff6970343e487ad3e2 /mod | |
parent | 33720d1cd2129b355e8a50b11b00acdc58aa31eb (diff) |
Bugfixes
Diffstat (limited to 'mod')
-rwxr-xr-x | mod/hakchi/rootfs/bin/chmenu | 2 | ||||
-rwxr-xr-x | mod/hakchi/rootfs/bin/clover-canoe-shvc-wr | 4 | ||||
-rwxr-xr-x | mod/hakchi/rootfs/bin/clover-kachikachi-wr | 4 | ||||
-rwxr-xr-x | mod/hakchi/rootfs/bin/hsqs | 3 | ||||
-rw-r--r-- | mod/hakchi/rootfs/etc/preinit | 1 | ||||
-rw-r--r-- | mod/hakchi/rootfs/etc/preinit.d/b0010_functions | 13 |
6 files changed, 19 insertions, 8 deletions
diff --git a/mod/hakchi/rootfs/bin/chmenu b/mod/hakchi/rootfs/bin/chmenu index c83f247..3ad32b8 100755 --- a/mod/hakchi/rootfs/bin/chmenu +++ b/mod/hakchi/rootfs/bin/chmenu @@ -31,5 +31,5 @@ fi uistop overmount_games - +sleep 1 touch "/var/startmcp.flag" diff --git a/mod/hakchi/rootfs/bin/clover-canoe-shvc-wr b/mod/hakchi/rootfs/bin/clover-canoe-shvc-wr index dc99ccd..b3b2bc0 100755 --- a/mod/hakchi/rootfs/bin/clover-canoe-shvc-wr +++ b/mod/hakchi/rootfs/bin/clover-canoe-shvc-wr @@ -34,5 +34,5 @@ done args="$options $cfg_snes_extra_args" -exec /bin/clover-canoe-shvc $args || \ -exec /usr/bin/clover-canoe-shvc $args +[ -f "/bin/clover-canoe-shvc" ] && exec /bin/clover-canoe-shvc $args +[ -f "/usr/bin/clover-canoe-shvc" ] && exec /usr/bin/clover-canoe-shvc $args diff --git a/mod/hakchi/rootfs/bin/clover-kachikachi-wr b/mod/hakchi/rootfs/bin/clover-kachikachi-wr index f0fc9bc..0da3c12 100755 --- a/mod/hakchi/rootfs/bin/clover-kachikachi-wr +++ b/mod/hakchi/rootfs/bin/clover-kachikachi-wr @@ -33,5 +33,5 @@ shift args="$filename $@ $cfg_nes_extra_args" [ "$cfg_disable_armet" == "y" ] && args="$(echo $args | sed 's/--enable-armet//g')" -exec /bin/clover-kachikachi $args || \ -exec /usr/bin/clover-kachikachi $args +[ -f "/bin/clover-kachikachi" ] && exec /bin/clover-kachikachi $args +[ -f "/usr/bin/clover-kachikachi" ] && exec /usr/bin/clover-kachikachi $args diff --git a/mod/hakchi/rootfs/bin/hsqs b/mod/hakchi/rootfs/bin/hsqs index 0b1d9d2..800c456 100755 --- a/mod/hakchi/rootfs/bin/hsqs +++ b/mod/hakchi/rootfs/bin/hsqs @@ -7,7 +7,8 @@ printSoftwareInfo firmware="$1" if [ "$firmware" != "_nand_" ]; then - firmware="$(readlink -f "$1")" + firmware="$(echo "$firmware" | sed -re 's/^\/usr\/share\/games\/(nes\/kachikachi\/)?/\/var\/games\//')" + firmware="$(readlink -f "$firmware")" checkFirmware "$firmware" || exit 1 fi diff --git a/mod/hakchi/rootfs/etc/preinit b/mod/hakchi/rootfs/etc/preinit index 6c7a765..731ab4a 100644 --- a/mod/hakchi/rootfs/etc/preinit +++ b/mod/hakchi/rootfs/etc/preinit @@ -50,6 +50,7 @@ save_config(){ script_init(){ source_base source_config + softwareCheck } preinit(){ diff --git a/mod/hakchi/rootfs/etc/preinit.d/b0010_functions b/mod/hakchi/rootfs/etc/preinit.d/b0010_functions index 6ef7bce..fef9208 100644 --- a/mod/hakchi/rootfs/etc/preinit.d/b0010_functions +++ b/mod/hakchi/rootfs/etc/preinit.d/b0010_functions @@ -231,12 +231,19 @@ softwareCheck(){ [ -d "$feck" ] && rm -rf "$feck.snes" && mv "$feck" "$feck.snes" [ -f "$feck.nes" ] && mv -f "$feck.nes" "$feck" fi - - linkGames "$gamepath" + rm -f "$mountpoint/var/saves" ln -s "/var/lib/clover/profiles/0" "$mountpoint/var/saves" } +repair_fonts(){ + if [ "$sftype" == "nes" ]; then + mkdir -p "$1" || return 1 + [ ! -f "$1/title.fnt" ] && (cp $rootfs$gamepath/title.fnt "$1" || cp $squashfs$gamepath/title.fnt "$1") + [ ! -f "$1/copyright.fnt" ] && (cp $rootfs$gamepath/copyright.fnt "$1" || cp $squashfs$gamepath/copyright.fnt "$1") + fi +} + overmount_games(){ local menu_code="000" [ -f "$installpath/menu" ] && menu_code="$(cat "$installpath/menu")" @@ -244,12 +251,14 @@ overmount_games(){ echo "menu code: $menu_code" if [ "$menu_code" != "000" ]; then if containsGames "$rootfs$gamepath/$menu_code"; then + repair_fonts "$rootfs$gamepath/$menu_code" overmount "$gamepath/$menu_code" "$gamepath" && linkGames "$rootfs$gamepath/$menu_code" && return 0 else echo "no romz found at: $rootfs$gamepath/$menu_code" fi fi if containsGames "$rootfs$gamepath"; then + repair_fonts "$rootfs$gamepath" overmount "$gamepath" && linkGames "$rootfs$gamepath" && return 0 fi echo "no romz found at: $rootfs$gamepath" |