From 443a6db3bdb16e73dc43f27f35498ca86c3eb2c5 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sun, 13 Aug 2023 19:45:03 +0300 Subject: [PATCH] Fix hjson-cli building --- bin/build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/build b/bin/build index 1cbd5fc..b2c0b1c 100755 --- a/bin/build +++ b/bin/build @@ -2,12 +2,14 @@ cd "$(realpath -- $(dirname "$0"))"/../src GO=${GO:-go} -mod=`$GO list -mod=vendor -m` +. ../config +[ -d vendor ] && vendor="-mod=vendor" || : +mod=`$GO list $vendor -m` 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" for cmd in `cat ../bin/cmd.list` ; do - $GO build -mod=vendor -o ../bin/$cmd $GO_CFLAGS -ldflags "$GO_LDFLAGS" ./cmd/$cmd + $GO build $vendor -o ../bin/$cmd $GO_CFLAGS -ldflags "$GO_LDFLAGS" ./cmd/$cmd done -$GO build -mod=vendor -o ../bin/$cmd $GO_CFLAGS github.com/hjson/hjson-go/hjson-cli +$GO build $vendor -o ../bin/hjson-cli $GO_CFLAGS github.com/hjson/hjson-go/hjson-cli -- 2.44.0