From 712977375773bdd290c9fb7476ba7fd93ff28d60 Mon Sep 17 00:00:00 2001
From: Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com>
Date: Wed, 22 Feb 2017 09:48:10 +0300
Subject: FDS fixes

---
 retroarch.hmod/bin/nes                   | 10 +++++++---
 retroarch.hmod/bin/retroarch-clover      |  1 -
 retroarch.hmod/usr/bin/clover-kachikachi |  4 +++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/retroarch.hmod/bin/nes b/retroarch.hmod/bin/nes
index 1188da3..5aa3c1b 100755
--- a/retroarch.hmod/bin/nes
+++ b/retroarch.hmod/bin/nes
@@ -2,11 +2,15 @@
 core=fceumm
 filename="$1"
 extension="${filename##*.}"
+crt=--ra-allow-crt
 if [ "$extension" == "fds" ] || [ "$extension" == "qd" ]; then
   core=nestopia
-  if [ ! -f /etc/libretro/system/disksys.rom ]; then
-    cp -f /usr/share/kachikachi/fds_bios.bin /etc/libretro/system/disksys.rom
+  crt=0
+  biosdir=/etc/libretro/system
+  if [ ! -f $biosdir/disksys.rom ]; then
+    mkdir -p $biosdir
+    cp -f /usr/share/kachikachi/fds_bios.bin $biosdir/disksys.rom
   fi
 fi
 
-exec retroarch-clover "$core" "$@" --ra-allow-crt
+exec retroarch-clover "$core" "$@" $crt
diff --git a/retroarch.hmod/bin/retroarch-clover b/retroarch.hmod/bin/retroarch-clover
index 11f7749..09a245f 100755
--- a/retroarch.hmod/bin/retroarch-clover
+++ b/retroarch.hmod/bin/retroarch-clover
@@ -90,4 +90,3 @@ echo $tm > "$save$t_suffix"
 clover-mcp
 
 return 0
-
diff --git a/retroarch.hmod/usr/bin/clover-kachikachi b/retroarch.hmod/usr/bin/clover-kachikachi
index ffffe2e..6179082 100755
--- a/retroarch.hmod/usr/bin/clover-kachikachi
+++ b/retroarch.hmod/usr/bin/clover-kachikachi
@@ -23,7 +23,6 @@ done
 
 # But this information is not corrent if it was FDS file or UNIF file
 [ "$extension" == "fds" ] && emulator=kachikachi
-[ "$extension" == "qd" ] && emulator=kachikachi
 [ "$extension" == "unf" ] && emulator=retroarch
 [ "$extension" == "unif" ] && emulator=retroarch
 
@@ -32,8 +31,11 @@ while [ $# -gt 0 ]; do
 	[ "$1" == "--core" ] && core=$2
   shift
 done
+args="$(echo $args | sed 's/--retroarch//g')"
+[ "$extension" == "qd" ] && emulator=kachikachi
 
 echo using $emulator
+args="$(echo $args | sed 's/--retroarch//g')"
 
 if [ "$emulator" == "kachikachi" ]; then
 # Seems like this game will work on default emulator
-- 
cgit v1.2.3