Fixes

4 files changed, 25 insertions, 25 deletions

diff --git a/core_modules/snes9x.hmod/bin/snes9x b/core_modules/snes9x.hmod/bin/snes9x
index 4eaef77..ed4bac9 100755
--- a/core_modules/snes9x.hmod/bin/snes9x
+++ b/core_modules/snes9x.hmod/bin/snes9x
@@ -5,11 +5,13 @@ filebase=$(basename "$filename")
 extension="${filebase##*.}"
 tmppath=/tmp/rom
 if [ "$extension" == "7z" ]; then
-  mkdir -p $tmppath
-  rm -rf $tmppath/*
-  cd $tmppath
-  tiny7zx x $filename
-  filename=$tmppath/$(ls)
+  rm -rf "$tmppath"
+  mkdir -p "$tmppath"
+  cd "$tmppath"
+  tiny7zx x "$filename"
+  filename="$(ls|head -n1)"
+  mv "$filename" "rom.${filename##*.}"
+  filename="$tmppath/rom.${filename##*.}"
 fi
 
 filebase=$(basename "$filename")
@@ -19,7 +21,7 @@ if [ "$extension" == "sfrom" ]; then
   rm -f $tmppath/*.7z
   rm -f $tmppath/*.bin
   dd if="$filename" of="$tmppath/$filebase.bin" bs=48 skip=1
-  filename=$tmppath/$filebase.bin
+  filename="$tmppath/$filebase.bin"
 fi
 shift
 
diff --git a/core_modules/snes9x2010.hmod/bin/snes b/core_modules/snes9x2010.hmod/bin/snes
index 87b242b..d5d7944 100755
--- a/core_modules/snes9x2010.hmod/bin/snes
+++ b/core_modules/snes9x2010.hmod/bin/snes
@@ -5,14 +5,13 @@ filebase=$(basename "$filename")
 extension="${filebase##*.}"
 tmppath=/tmp/rom
 if [ "$extension" == "7z" ]; then
-  mkdir -p $tmppath
-  rm -rf $tmppath/*
-  cd $tmppath
-  tiny7zx x $filename
-  filename=$tmppath/$(ls)
-  filename_str=${filename// /_}
-  mv "$filename" "$filename_str"
-  filename=$filename_str
+  rm -rf "$tmppath"
+  mkdir -p "$tmppath"
+  cd "$tmppath"
+  tiny7zx x "$filename"
+  filename="$(ls|head -n1)"
+  mv "$filename" "rom.${filename##*.}"
+  filename="$tmppath/rom.${filename##*.}"
 fi
 
 filebase=$(basename "$filename")
@@ -22,7 +21,7 @@ if [ "$extension" == "sfrom" ]; then
   rm -f $tmppath/*.7z
   rm -f $tmppath/*.bin
   dd if="$filename" of="$tmppath/$filebase.bin" bs=48 skip=1
-  filename=$tmppath/$filebase.bin
+  filename="$tmppath/$filebase.bin"
 fi
 shift
 
diff --git a/core_modules/snes9x2010.hmod/bin/snes9x2010 b/core_modules/snes9x2010.hmod/bin/snes9x2010
index 87b242b..d5d7944 100755
--- a/core_modules/snes9x2010.hmod/bin/snes9x2010
+++ b/core_modules/snes9x2010.hmod/bin/snes9x2010
@@ -5,14 +5,13 @@ filebase=$(basename "$filename")
 extension="${filebase##*.}"
 tmppath=/tmp/rom
 if [ "$extension" == "7z" ]; then
-  mkdir -p $tmppath
-  rm -rf $tmppath/*
-  cd $tmppath
-  tiny7zx x $filename
-  filename=$tmppath/$(ls)
-  filename_str=${filename// /_}
-  mv "$filename" "$filename_str"
-  filename=$filename_str
+  rm -rf "$tmppath"
+  mkdir -p "$tmppath"
+  cd "$tmppath"
+  tiny7zx x "$filename"
+  filename="$(ls|head -n1)"
+  mv "$filename" "rom.${filename##*.}"
+  filename="$tmppath/rom.${filename##*.}"
 fi
 
 filebase=$(basename "$filename")
@@ -22,7 +21,7 @@ if [ "$extension" == "sfrom" ]; then
   rm -f $tmppath/*.7z
   rm -f $tmppath/*.bin
   dd if="$filename" of="$tmppath/$filebase.bin" bs=48 skip=1
-  filename=$tmppath/$filebase.bin
+  filename="$tmppath/$filebase.bin"
 fi
 shift
 
diff --git a/retroarch.hmod/bin/retroarch-clover-child b/retroarch.hmod/bin/retroarch-clover-child
index a7a1586..d95df65 100755
--- a/retroarch.hmod/bin/retroarch-clover-child
+++ b/retroarch.hmod/bin/retroarch-clover-child
@@ -34,7 +34,7 @@ while [ $# -gt 0 ]; do
   shift
 done
 
-[ -z "$timefile_save" ] && timefile_save=$load$t_suffix
+[ -z "$timefile_save" ] && timefile_save=$save$t_suffix
 [ -z "$timefile_load" ] && timefile_load=$load$t_suffix
 
 [ ! -z "$demo" ] && load=$(dirname $load)/savestate