From 9f0fefd3693fe2b3f05f74dd30c628edb207307f Mon Sep 17 00:00:00 2001
From: Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com>
Date: Tue, 20 Feb 2018 02:19:58 +0300
Subject: Fixed snes9x/snes9x2010 conflict

---
 core_modules/snes9x.hmod/bin/snes           | 26 --------------------------
 core_modules/snes9x.hmod/bin/snes9x         | 26 ++++++++++++++++++++++++++
 core_modules/snes9x2010.hmod/bin/snes9x2010 | 29 +++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 26 deletions(-)
 delete mode 100755 core_modules/snes9x.hmod/bin/snes
 create mode 100755 core_modules/snes9x.hmod/bin/snes9x
 create mode 100755 core_modules/snes9x2010.hmod/bin/snes9x2010

diff --git a/core_modules/snes9x.hmod/bin/snes b/core_modules/snes9x.hmod/bin/snes
deleted file mode 100755
index 4eaef77..0000000
--- a/core_modules/snes9x.hmod/bin/snes
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-filename=$1
-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)
-fi
-
-filebase=$(basename "$filename")
-extension="${filebase##*.}"
-if [ "$extension" == "sfrom" ]; then
-  mkdir -p $tmppath
-  rm -f $tmppath/*.7z
-  rm -f $tmppath/*.bin
-  dd if="$filename" of="$tmppath/$filebase.bin" bs=48 skip=1
-  filename=$tmppath/$filebase.bin
-fi
-shift
-
-exec retroarch-clover snes9x "$filename" "$@"
diff --git a/core_modules/snes9x.hmod/bin/snes9x b/core_modules/snes9x.hmod/bin/snes9x
new file mode 100755
index 0000000..4eaef77
--- /dev/null
+++ b/core_modules/snes9x.hmod/bin/snes9x
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+filename=$1
+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)
+fi
+
+filebase=$(basename "$filename")
+extension="${filebase##*.}"
+if [ "$extension" == "sfrom" ]; then
+  mkdir -p $tmppath
+  rm -f $tmppath/*.7z
+  rm -f $tmppath/*.bin
+  dd if="$filename" of="$tmppath/$filebase.bin" bs=48 skip=1
+  filename=$tmppath/$filebase.bin
+fi
+shift
+
+exec retroarch-clover snes9x "$filename" "$@"
diff --git a/core_modules/snes9x2010.hmod/bin/snes9x2010 b/core_modules/snes9x2010.hmod/bin/snes9x2010
new file mode 100755
index 0000000..87b242b
--- /dev/null
+++ b/core_modules/snes9x2010.hmod/bin/snes9x2010
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+filename=$1
+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
+fi
+
+filebase=$(basename "$filename")
+extension="${filebase##*.}"
+if [ "$extension" == "sfrom" ]; then
+  mkdir -p $tmppath
+  rm -f $tmppath/*.7z
+  rm -f $tmppath/*.bin
+  dd if="$filename" of="$tmppath/$filebase.bin" bs=48 skip=1
+  filename=$tmppath/$filebase.bin
+fi
+shift
+
+exec retroarch-clover snes9x2010 "$filename" "$@"
-- 
cgit v1.2.3