X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=planime;h=a25761e57085257e90b260056d16488adeb7cd79;hb=061f96f39161db753b603e9f057b1e3afb1b6e83;hp=3dab1dd4c5d4c588bb5e106f9178a691280b4872;hpb=dc508f57af7005ba808ef5ab560b33c4d886ae6e;p=utils.git

diff --git a/planime b/planime
index 3dab1dd..a25761e 100755
--- a/planime
+++ b/planime
@@ -19,7 +19,7 @@ findfile() {
     local file tail eq eqt m matches max score
     matches=()
     for file in "$1"*; do
-	tail="${file#$1}"
+	tail="${file#"$1"}"
 	eq="${tail%.*}"
 	m=n
 	if [ "${eq%% *}" -eq "$2" ] 2>/dev/null; then
@@ -108,44 +108,31 @@ while [ "${1:0:1}" = - ]; do
     esac
 done
 
-base="$(basename "$(pwd)")"
+dirbase="$(basename "$(pwd)")"
+base=.
 nextep=n
 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"
     else
-	if findfile "$base - " "$1" >/dev/null; then
-	    ep="$1"
-	else
-	    nextep=y
-	    base="$base $1"
-	fi
+	base=
+	ep="$1"
     fi
 elif [ $# -eq 2 ]; then
-    if findfile "$base - " "$1" "$2" >/dev/null; then
+    if findfile "$dirbase - " "$1" "$2" >/dev/null; then
+	base=""
 	ep="$1"
 	tqual="$2"
     else
-	if [ "$1" = . -a -r curser ]; then
-	    base="$base $(<curser)"
-	else
-	    base="$base $1"
-	fi
+	base="$1"
 	ep="$2"
     fi
 else
-    if [ "$1" = . -a -r curser ]; then
-	base="$base $(<curser)"
-    else
-	base="$base $1"
-    fi
+    base="$1"
     ep="$2"
     tqual="$3"
 fi
@@ -158,7 +145,21 @@ if [ "$nextep" = y -a -r nextep ]; then
     fi
 fi
 if [ -z "$file" ]; then
-    file="$(findfile "$base - " "$ep" "$tqual")"
+    if [ "$base" = . ]; then
+	if [ -r curser ]; then
+	    curser="$(<curser)"
+	else
+	    curser=
+	fi
+    else
+	curser="$base"
+    fi
+    if [ -n "$curser" ]; then
+	file="$(findfile "$dirbase $curser - " "$ep" "$tqual")" || \
+	    file="$(findfile "$curser - " "$ep" "$tqual")"
+    else
+	file="$(findfile "$dirbase - " "$ep" "$tqual")"
+    fi
 fi
 
 if [ -z "$file" -o ! -r "$file" ]; then