Pi-hole/pivpn
Pi-hole/pivpn
1
0
Fork 0
mirror of https://github.com/pivpn/pivpn.git synced 2024-12-18 19:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(core): Use absolute path for git

Browse source 
On installations such as OctoPi, git is shadowed by /root/bin/git. This change forces the script to use /usr/bin/git which isn't affected by other executables with the name 'git' in the path.
This commit is contained in:
Sriram Keerthi Madhava Kunjathur 2023-04-07 14:15:50 +02:00 committed by 4s3ti
parent 4032a55c80
commit 23337523fa
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
auto_install/install.sh
View file

@ -19,6 +19,7 @@ setupConfigDir="/etc/pivpn"
tempsetupVarsFile="/tmp/setupVars.conf" tempsetupVarsFile="/tmp/setupVars.conf"
pivpnFilesDir="/usr/local/src/pivpn" pivpnFilesDir="/usr/local/src/pivpn"
pivpnScriptDir="/opt/pivpn" pivpnScriptDir="/opt/pivpn"
GITBIN="/usr/bin/git"
piholeSetupVars="/etc/pihole/setupVars.conf" piholeSetupVars="/etc/pihole/setupVars.conf"
dnsmasqConfig="/etc/dnsmasq.d/02-pivpn.conf" dnsmasqConfig="/etc/dnsmasq.d/02-pivpn.conf"
@ -1530,7 +1531,7 @@ isRepo() {
echo " not found!" echo " not found!"
return 1 return 1
} }
${SUDO} git status &> /dev/null && echo " OK!" ${SUDO} ${GITBIN} status &> /dev/null && echo " OK!"
#shellcheck disable=SC2317 #shellcheck disable=SC2317
return 0 || echo " not found!" return 0 || echo " not found!"
#shellcheck disable=SC2317 #shellcheck disable=SC2317
@ -1554,7 +1555,7 @@ updateRepo() {
# Go back to /usr/local/src otherwise git will complain when the current # Go back to /usr/local/src otherwise git will complain when the current
# working directory has just been deleted (/usr/local/src/pivpn). # working directory has just been deleted (/usr/local/src/pivpn).
cd /usr/local/src \ cd /usr/local/src \
&& ${SUDO} git clone -q \ && ${SUDO} ${GITBIN} clone -q \
--depth 1 \ --depth 1 \
--no-single-branch \ --no-single-branch \
"${2}" \ "${2}" \
@ -1566,13 +1567,13 @@ updateRepo() {
if [[ -n "${pivpnGitBranch}" ]]; then if [[ -n "${pivpnGitBranch}" ]]; then
echo "::: Checkout branch '${pivpnGitBranch}' from ${2} in ${1}..." echo "::: Checkout branch '${pivpnGitBranch}' from ${2} in ${1}..."
${SUDOE} git checkout -q "${pivpnGitBranch}" ${SUDOE} ${GITBIN} checkout -q "${pivpnGitBranch}"
echo "::: Custom branch checkout done!" echo "::: Custom branch checkout done!"
elif [[ -z "${TESTING+x}" ]]; then elif [[ -z "${TESTING+x}" ]]; then
: :
else else
echo "::: Checkout branch 'test' from ${2} in ${1}..." echo "::: Checkout branch 'test' from ${2} in ${1}..."
${SUDOE} git checkout -q test ${SUDOE} ${GITBIN} checkout -q test
echo "::: 'test' branch checkout done!" echo "::: 'test' branch checkout done!"
fi fi
fi fi
@ -1591,7 +1592,7 @@ makeRepo() {
# Go back to /usr/local/src otherwhise git will complain when the current # Go back to /usr/local/src otherwhise git will complain when the current
# working directory has just been deleted (/usr/local/src/pivpn). # working directory has just been deleted (/usr/local/src/pivpn).
cd /usr/local/src \ cd /usr/local/src \
&& ${SUDO} git clone -q \ && ${SUDO} ${GITBIN} clone -q \
--depth 1 \ --depth 1 \
--no-single-branch \ --no-single-branch \
"${2}" \ "${2}" \
@ -1603,13 +1604,13 @@ makeRepo() {
if [[ -n "${pivpnGitBranch}" ]]; then if [[ -n "${pivpnGitBranch}" ]]; then
echo "::: Checkout branch '${pivpnGitBranch}' from ${2} in ${1}..." echo "::: Checkout branch '${pivpnGitBranch}' from ${2} in ${1}..."
${SUDOE} git checkout -q "${pivpnGitBranch}" ${SUDOE} ${GITBIN} checkout -q "${pivpnGitBranch}"
echo "::: Custom branch checkout done!" echo "::: Custom branch checkout done!"
elif [[ -z "${TESTING+x}" ]]; then elif [[ -z "${TESTING+x}" ]]; then
: :
else else
echo "::: Checkout branch 'test' from ${2} in ${1}..." echo "::: Checkout branch 'test' from ${2} in ${1}..."
${SUDOE} git checkout -q test ${SUDOE} ${GITBIN} checkout -q test
echo "::: 'test' branch checkout done!" echo "::: 'test' branch checkout done!"
fi fi
} }