no longer forces default;
authorwenzelm
Fri, 25 Apr 1997 15:06:21 +0200
changeset 3052 b7922b9d7acd
parent 3051 30490aa41356
child 3053 db72904b42fb
no longer forces default;
lib/scripts/patch-scripts.bash
--- a/lib/scripts/patch-scripts.bash	Fri Apr 25 14:12:33 1997 +0200
+++ b/lib/scripts/patch-scripts.bash	Fri Apr 25 15:06:21 1997 +0200
@@ -9,25 +9,23 @@
 function findbin()
 {
   local DEFAULT="$1"
-  local BASE=""
+  local BASE=$(basename "$DEFAULT")
   local BINARY=""
 
-  if [ -f "$DEFAULT" ]; then	# preferred location
+  BINARY=$(type -path "$BASE")
+
+  if [ -n "$BINARY" ]; then
+    echo "using $BINARY" >&2
+    echo "$BINARY"
+    return
+  elif [ -f "$DEFAULT" ]; then
     echo "using $DEFAULT" >&2
     echo "$DEFAULT"
     return
-  else				# find in PATH
-    BASE=$(basename "$DEFAULT")
-    BINARY=$(type -path "$BASE")
-    if [ -n "$BINARY" ]; then
-      echo "using $BINARY" >&2
-      echo "$BINARY"
-      return
-    else
-      echo "WARNING: $BASE not found!" >&2
-      echo "$DEFAULT"
-      return
-    fi
+  else
+    echo "WARNING: $BASE not found!" >&2
+    echo "$DEFAULT"
+    return
   fi
 }