Many tiny fixes, rc5

6 files changed, 45 insertions, 30 deletions

diff --git a/mods/mod_hakchi/hakchi/rootfs/bin/chmenu b/mods/mod_hakchi/hakchi/rootfs/bin/chmenu
index 5bc02713..5dff8aa1 100644
--- a/mods/mod_hakchi/hakchi/rootfs/bin/chmenu
+++ b/mods/mod_hakchi/hakchi/rootfs/bin/chmenu
@@ -3,7 +3,7 @@ source /etc/preinit
 script_init
 
 state_file=$installpath/menu
-flag=/tmp/startmpc.flag
+flag=/var/startmpc.flag
 
 [ -z "$1" ] && exit 1
 [ -f "$state_file" ] && prev_code=$(cat "$state_file") || prev_code=000
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 97fe3e9d..eaf903db 100644
--- a/mods/mod_hakchi/hakchi/rootfs/bin/clover-canoe-shvc-wr
+++ b/mods/mod_hakchi/hakchi/rootfs/bin/clover-canoe-shvc-wr
@@ -6,21 +6,30 @@
 source /etc/preinit
 script_init
 
-arg1=$1
-filename=$2
-filebase=$(basename "$filename")
-extension="${filebase##*.}"
-tmppath=/tmp/rom
-if [ "$extension" == "7z" ]; then
-  mkdir -p $tmppath
-  rm -rf $tmppath/*
-  cd $tmppath
-  tiny7zx x $filename
-  filename=$(ls)
-fi
-shift
-shift
+options=""
 
-args="$arg1 $filename $@ $cfg_snes_extra_args"
+while [ $# -gt 0 ] ; do
+  case "$1" in
+  -rom)
+    filename=$2
+    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
+    options="-rom $filename"
+    shift
+    ;;
+  *) options="$options $1" ;;
+  esac
+  shift
+done
+
+args="$options $cfg_snes_extra_args"
 
 exec /usr/bin/clover-canoe-shvc $args
diff --git a/mods/mod_hakchi/hakchi/rootfs/bin/clover-kachikachi-wr b/mods/mod_hakchi/hakchi/rootfs/bin/clover-kachikachi-wr
index fd24f406..a3bed783 100644
--- a/mods/mod_hakchi/hakchi/rootfs/bin/clover-kachikachi-wr
+++ b/mods/mod_hakchi/hakchi/rootfs/bin/clover-kachikachi-wr
@@ -16,7 +16,7 @@ if [ "$extension" == "7z" ]; then
   rm -rf $tmppath/*
   cd $tmppath
   tiny7zx x $filename
-  filename=$(ls)
+  filename=$tmppath/$(ls)
 fi
 if [ "$extension" == "gz" ]; then
   mkdir -p $tmppath
diff --git a/mods/mod_hakchi/hakchi/rootfs/bin/mcp-restarter b/mods/mod_hakchi/hakchi/rootfs/bin/mcp-restarter
deleted file mode 100644
index a09f331d..00000000
--- a/mods/mod_hakchi/hakchi/rootfs/bin/mcp-restarter
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-flag=/tmp/startmpc.flag
-while [ true ]; do
-  #sleep 1
-  if [ -f "$flag" ]; then
-    echo Restart!
-    /etc/init.d/S81clover-mcp start
-    rm $flag
-  fi
-done
diff --git a/mods/mod_hakchi/hakchi/rootfs/bin/remote-exec b/mods/mod_hakchi/hakchi/rootfs/bin/remote-exec
new file mode 100644
index 00000000..f4368fa8
--- /dev/null
+++ b/mods/mod_hakchi/hakchi/rootfs/bin/remote-exec
@@ -0,0 +1,16 @@
+#!/bin/sh
+mpc_flag=/var/startmpc.flag
+exec_flag=/var/exec.flag
+while [ true ]; do
+  #sleep 1
+  if [ -f "$mpc_flag" ]; then
+    echo Restart!
+    /etc/init.d/S81clover-mcp start
+    rm $mpc_flag
+  fi
+  if [ -f "$exec_flag" ]; then
+    cmd=$(cat "$exec_flag")
+    rm $exec_flag
+    $cmd
+  fi
+done
diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/init.d/S82mcp-restarter b/mods/mod_hakchi/hakchi/rootfs/etc/init.d/S82remote-exec
index 964c84de..65395aaa 100644
--- a/mods/mod_hakchi/hakchi/rootfs/etc/init.d/S82mcp-restarter
+++ b/mods/mod_hakchi/hakchi/rootfs/etc/init.d/S82remote-exec
@@ -1,11 +1,11 @@
 #!/bin/sh -e
 
 start() {
-	mcp-restarter &
+	remote-exec &
 }
 
 stop() {
-	killall mcp-restarter
+	killall remote-exec
 }
 
 case "$1" in
@@ -20,7 +20,7 @@ restart)
 	start
 ;;
 *)
-	echo "mcp-restarter: Please use start, stop, or restart."
+	echo "remote-exec: Please use start, stop, or restart."
 	exit 1
 ;;
 esac