From c68cfe082f977f78c8c977f6a97d5c098df88dec Mon Sep 17 00:00:00 2001
From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Date: Tue, 1 Oct 2024 10:03:32 +0200
Subject: [PATCH] Replace which with command -v
which is an external command, command -v is the equivalent shell built-in.
Replacing the calls to which with command -v removes a build time dependency.
Bug: https://bugs.gentoo.org/940563
Signed-off-by: Nowa Ammerlaan <nowa-ammerlaan@riseup.net>
---
Makefile | 2 +-
gui/build.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index fbe58b8c..13e8a63b 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ OPENVPN_WINDOWS_INSTALLER = https://build.openvpn.net/downloads/releases/OpenVPN
ifeq ($(PLATFORM), linux)
HAS_QTIFW :=
else
-HAS_QTIFW := $(shell which binarycreator)
+HAS_QTIFW := $(shell command -v binarycreator)
endif
OPENVPN_BIN = "$(HOME)/openvpn_build/sbin/$(shell grep OPENVPN branding/thirdparty/openvpn/build_openvpn.sh | head -n 1 | cut -d = -f 2 | tr -d '"')"
diff --git a/gui/build.sh b/gui/build.sh
index 8bc22feb..ceacd1d1 100755
--- a/gui/build.sh
+++ b/gui/build.sh
@@ -13,7 +13,7 @@ LDFLAGS_VER="-X 0xacab.org/leap/bitmask-vpn/pkg/config/version.appVersion=${VERS
OSX_TARGET=12
WIN64="win64"
-GO=`which go`
+GO=`command -v go`
PROJECT=bitmask.pro
TARGET_GOLIB=lib/libgoshim.a
--
GitLab