1 files changed, 6 insertions, 5 deletions
diff --git a/mods/mod_hakchi/hakchi/rootfs/bin/clover-canoe-shvc-wr b/mods/mod_hakchi/hakchi/rootfs/bin/clover-canoe-shvc-wr
index c7cfb5b7..b3b2bc0f 100755
--- a/mods/mod_hakchi/hakchi/rootfs/bin/clover-canoe-shvc-wr
+++ b/mods/mod_hakchi/hakchi/rootfs/bin/clover-canoe-shvc-wr
@@ -20,10 +20,9 @@ while [ $# -gt 0 ] ; do
       mkdir -p "$tmppath"
       cd "$tmppath"
       tiny7zx x "$filename"
-      filename="$tmppath/$(ls)"
-      filename_str=${filename// /_}
-      mv "$filename" "$filename_str"
-      filename=$filename_str
+      filename="$(ls|head -n1)"
+      mv "$filename" "rom.${filename##*.}"
+      filename="$tmppath/rom.${filename##*.}"
     fi
     options="-rom $filename"
     shift
@@ -34,4 +33,6 @@ while [ $# -gt 0 ] ; do
 done
 
 args="$options $cfg_snes_extra_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