X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=planime;h=60549e95a2489e9c9b7cdbbdcd7a94d4fe5f35e5;hb=5f7e91433d5fea086080b9c7891abad6ed8025b7;hp=004aa2a8155f5d6cde966bc6aebcf3c987e45205;hpb=90aff0d0e0e041b357afb15be9a22608b4f68ab2;p=utils.git

diff --git a/planime b/planime
index 004aa2a..60549e9 100755
--- a/planime
+++ b/planime
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 isnum() {
     grep -xq '[0-9]\+' <<<"$1"
@@ -48,6 +48,16 @@ while [ "${1:0:1}" = - ]; do
 	-t)
 	    cmdline=("${cmdline[@]}" -ao oss:/dev/dsp1)
 	    ;;
+	-A)
+	    while :; do
+		a="$1"
+		shift
+		if [ "$a" = \; ]; then
+		    break;
+		fi
+		cmdline=("${cmdline[@]}" "$a")
+	    done
+	    ;;
 	-s)
 	    savepar="$1"
 	    shift
@@ -63,6 +73,9 @@ file=
 tqual=
 if [ $# -eq 0 ]; then
     nextep=y
+    if [ -r curser ]; then
+	base="$base $(<curser)"
+    fi
 elif [ $# -eq 1 ]; then
     if [ -r "$1" ]; then
 	file="$1"
@@ -79,11 +92,19 @@ elif [ $# -eq 2 ]; then
 	ep="$1"
 	tqual="$2"
     else
-	base="$base $1"
+	if [ "$1" = . -a -r curser ]; then
+	    base="$base $(<curser)"
+	else
+	    base="$base $1"
+	fi
 	ep="$2"
     fi
 else
-    base="$base $1"
+    if [ "$1" = . -a -r curser ]; then
+	base="$base $(<curser)"
+    else
+	base="$base $1"
+    fi
     ep="$2"
     tqual="$3"
 fi
@@ -96,7 +117,7 @@ if [ "$nextep" = y -a -r nextep ]; then
     fi
 fi
 if [ -z "$file" ]; then
-    file="$(findfile "$base - " "$ep" "$qual")"
+    file="$(findfile "$base - " "$ep" "$tqual")"
 fi
 
 if [ -z "$file" -o ! -r "$file" ]; then
@@ -113,22 +134,31 @@ case "${file##*.}" in
 	;;
 esac
 
-ifile=".${ep}.info"
+ifile=".${file}.info"
 
 if [ -n "$savepar" ]; then
     if [ -r "$ifile" ]; then
-	egrep -v "^${savepar}:" "$ifile" >"$ifile.new"
+	egrep -v "^${savepar} " "$ifile" >"$ifile.new"
 	mv -f "$ifile.new" "$ifile"
     fi
-    echo "$savepar: $saveval" >>"$ifile"
+    echo "$savepar $saveval" >>"$ifile"
     exit 0
 fi
 
 unset delay
 
 if [ -r "$ifile" ]; then
-    delay="$(sed -n 's/delay *: *\([^ ]*\)$/\1/p' <"$ifile")"
-    cmdline=("${cmdline[@]}" -delay "$delay")
+    exec 3<&0
+    exec 0<"$ifile"
+    while read par arg; do
+	if [ "$par" = delay ]; then
+	    cmdline=("${cmdline[@]}" -delay "$arg")
+	elif [ "$par" = aspect ]; then
+	    cmdline=("${cmdline[@]}" -aspect "$arg")
+	fi
+    done
+    exec 0<&3
+    exec 3<&-
 else
     cmdline=("${cmdline[@]}" "${defopts[@]}")
 fi