From 268a437b474c20c7a85762e40d26ee2fefa6f364 Mon Sep 17 00:00:00 2001
From: d6 <d_m@plastic-idolatry.com>
Date: Mon, 17 Jul 2023 13:21:00 -0400
Subject: [PATCH] improve uxnrun

---
 uxnrun | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/uxnrun b/uxnrun
index 22d85ff..c9514c2 100755
--- a/uxnrun
+++ b/uxnrun
@@ -1,24 +1,23 @@
 #!/bin/sh
 
-BIN="$HOME/w/uxn/bin"
+#PREFIX="$HOME/w/uxn/bin/"
+PREFIX=""
 
 if [ $# -lt 1 ]; then
-    echo "usage: $0 [-c] FILE.tal"
+    echo "usage: $0 [-c] [-s N] FILE.tal"
     exit 1
 fi
 
-RUN='uxnemu'
+ASM="${PREFIX}uxnasm"
+CLI="${PREFIX}uxncli"
+EMU="${PREFIX}uxnemu"
+
+RUN="$EMU"
 case "$1" in
-    -c) RUN='uxncli'; shift;;
-    -s) RUN="uxnemu -s $2"; shift; shift;;
+    -c) RUN="$CLI"; shift;;
+    -s) RUN="$EMU -s $2"; shift; shift;;
 esac
 
 DEST=$( echo "$1" | sed -re 's#\.tal$#.rom#' )
-#$BIN/uxncli asma.rom $1 $DEST && $BIN/$RUN $DEST
-uxnasm $1 $DEST && $BIN/$RUN $DEST
 
-#case "$1" in
-#    -c) $BIN/uxnasm $2 $DEST && $BIN/uxncli $DEST;;
-#    -s) $BIN/uxnasm $3 $DEST && $BIN/uxnemu -s $2 $DEST;;
-#    *) $BIN/uxnasm $1 $DEST && $BIN/uxnemu $DEST;;
-#esac
+$ASM $1 $DEST && $RUN $DEST