From d7e5936812368ab8aba80c9d848cbc23861a555e Mon Sep 17 00:00:00 2001
From: Adrian Thurston <thurston@colm.net>
Date: Tue, 14 Apr 2020 11:09:09 +0000
Subject: allow colm-command (-w) to be a full path

Don't try and compute the path to the command when it is already specified.
---
 src/colm-wrap.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/colm-wrap.sh b/src/colm-wrap.sh
index 8140afca..b2c9dbac 100644
--- a/src/colm-wrap.sh
+++ b/src/colm-wrap.sh
@@ -61,10 +61,14 @@ if [ "${INPUT%.pack}" != "$INPUT" ]; then
 	EXIT_STATUS=$?
 else
 	CMD=${CMD:=colm}
-	if [ "`basename $0`" != "$0" ] && [ -x "`dirname $0`/$CMD" ]; then
-		COLM="`dirname $0`/$CMD"
+	if [ "`basename $CMD`" != "$CMD" ]; then
+		COLM=$CMD
 	else
-		COLM=@prefix@/bin/$CMD
+		if [ "`basename $0`" != "$0" ] && [ -x "`dirname $0`/$CMD" ]; then
+			COLM="`dirname $0`/$CMD"
+		else
+			COLM=@prefix@/bin/$CMD
+		fi
 	fi
 
 	$COLM $ARGS "$INPUT"
-- 
cgit v1.2.1