From aa454b158f3713b2ee47162837dcea1efdce0ee6 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 25 Jun 2025 20:44:49 +0900 Subject: cmd/planterette: remove hsu special case Remove special case and invoke hakurei out of process. Signed-off-by: Ophestra --- dist/install.sh | 2 +- dist/release.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'dist') diff --git a/dist/install.sh b/dist/install.sh index 37f55084..8601b27f 100755 --- a/dist/install.sh +++ b/dist/install.sh @@ -2,7 +2,7 @@ cd "$(dirname -- "$0")" || exit 1 install -vDm0755 "bin/hakurei" "${HAKUREI_INSTALL_PREFIX}/usr/bin/hakurei" -install -vDm0755 "bin/fpkg" "${HAKUREI_INSTALL_PREFIX}/usr/bin/fpkg" +install -vDm0755 "bin/planterette" "${HAKUREI_INSTALL_PREFIX}/usr/bin/planterette" install -vDm6511 "bin/hsu" "${HAKUREI_INSTALL_PREFIX}/usr/bin/hsu" if [ ! -f "${HAKUREI_INSTALL_PREFIX}/etc/hsurc" ]; then diff --git a/dist/release.sh b/dist/release.sh index 90f44c02..004b6861 100755 --- a/dist/release.sh +++ b/dist/release.sh @@ -11,9 +11,9 @@ cp -rv "dist/comp" "${out}" go generate ./... go build -trimpath -v -o "${out}/bin/" -ldflags "-s -w -buildid= -extldflags '-static' -X git.gensokyo.uk/security/hakurei/internal.version=${VERSION} + -X git.gensokyo.uk/security/hakurei/internal.hakurei=/usr/bin/hakurei -X git.gensokyo.uk/security/hakurei/internal.hsu=/usr/bin/hsu - -X main.hmain=/usr/bin/hakurei - -X main.fpkg=/usr/bin/fpkg" ./... + -X main.hmain=/usr/bin/hakurei" ./... rm -f "./${out}.tar.gz" && tar -C dist -czf "${out}.tar.gz" "${pname}" rm -rf "./${out}" -- cgit v1.3.1