From 59aa25d3c35808e99694351103ada449a32af5b9 Mon Sep 17 00:00:00 2001
From: 0x1eef <0x1eef@protonmail.com>
Date: Wed, 22 May 2024 23:31:35 -0300
Subject: [PATCH] Fix running ./bin/portzap within repo

---
 libexec/portzap/git-changed-files | 2 +-
 libexec/portzap/git-removed-files | 2 +-
 libexec/portzap/git-rev           | 2 +-
 libexec/portzap/portzap-checkout  | 2 +-
 libexec/portzap/portzap-clone     | 4 ++--
 libexec/portzap/portzap-pull      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libexec/portzap/git-changed-files b/libexec/portzap/git-changed-files
index 7bce36e..7cacdce 100644
--- a/libexec/portzap/git-changed-files
+++ b/libexec/portzap/git-changed-files
@@ -4,7 +4,7 @@ set -e
 ##
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../..)}
-git="${localbase}"/bin/git
+git=$(which git)
 mode=u=rwX,g=rX,o=
 gitdir=$1
 commit=$2
diff --git a/libexec/portzap/git-removed-files b/libexec/portzap/git-removed-files
index b8e88eb..ae7a346 100644
--- a/libexec/portzap/git-removed-files
+++ b/libexec/portzap/git-removed-files
@@ -4,7 +4,7 @@ set -e
 ##
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../..)}
-git="${localbase}"/bin/git
+git=$(which git)
 mode=u=rwX,g=rX,o=
 gitdir=$1
 commit=$2
diff --git a/libexec/portzap/git-rev b/libexec/portzap/git-rev
index 08dabb3..77e30ef 100644
--- a/libexec/portzap/git-rev
+++ b/libexec/portzap/git-rev
@@ -4,7 +4,7 @@ set -e
 ##
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../..)}
-git="${localbase}"/bin/git
+git=$(which git)
 mode=u=rwX,g=rX,o=
 gitdir=$1
 
diff --git a/libexec/portzap/portzap-checkout b/libexec/portzap/portzap-checkout
index ee0f234..a5cb533 100644
--- a/libexec/portzap/portzap-checkout
+++ b/libexec/portzap/portzap-checkout
@@ -5,7 +5,7 @@ set -e
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../..)}
 libexec="${localbase}"/libexec/portzap
-git="${localbase}"/bin/git
+git=$(which git)
 mode="u=rwX,g=rX,o="
 gitdir="$1"
 branch="$2"
diff --git a/libexec/portzap/portzap-clone b/libexec/portzap/portzap-clone
index 27f6d30..c37c942 100755
--- a/libexec/portzap/portzap-clone
+++ b/libexec/portzap/portzap-clone
@@ -5,11 +5,11 @@ set -e
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../..)}
 libexec="${localbase}"/libexec/portzap
-git="${localbase}"/bin/git
+git=$(which git)
+mode=u=rwX,g=rX,o=
 giturl=$1
 gitdir=$2
 branch=$3
-mode=u=rwX,g=rX,o=
 
 ##
 # functions
diff --git a/libexec/portzap/portzap-pull b/libexec/portzap/portzap-pull
index 63346a4..1fef7cd 100755
--- a/libexec/portzap/portzap-pull
+++ b/libexec/portzap/portzap-pull
@@ -5,7 +5,7 @@ set -e
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../..)}
 libexec="${localbase}"/libexec/portzap
-git="${localbase}"/bin/git
+git=$(which git)
 mode="u=rwX,g=rX,o="
 gitdir=$1