From: Sergey Matveev <stargrave@stargrave.org>
Date: Mon, 5 Dec 2022 08:18:24 +0000 (+0300)
Subject: More reliable redo target
X-Git-Tag: v8.8.3^2~22
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=faaae8532c13107cc7c4c7aed9d7bffa84d0761d

More reliable redo target

contrib/do can use long relative paths as a "$1" argument to default target.
---

diff --git a/bin/default.do b/bin/default.do
index b9ac0f8..52c5501 100644
--- a/bin/default.do
+++ b/bin/default.do
@@ -1,5 +1,5 @@
 cd ../src
-redo-ifchange ../config *.go cmd/$1/*.go
+redo-ifchange ../config *.go cmd/${1##*/}/*.go
 . ../config
 GO=${GO:-go}
 mod=`$GO list -m`
@@ -7,4 +7,4 @@ GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultCfgPath=$CFGPATH"
 GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultSendmailPath=$SENDMAIL"
 GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultSpoolPath=$SPOOLPATH"
 GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultLogPath=$LOGPATH"
-$GO build -o ../bin/$3 $GO_CFLAGS -ldflags "$GO_LDFLAGS" ./cmd/$1
+$GO build -o ../bin/$3 $GO_CFLAGS -ldflags "$GO_LDFLAGS" ./cmd/${1##*/}