improve uxnrun

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