arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-01-03 04:30:55 +00:00
Code Issues Releases Wiki Activity

Fix risk of popd without a pushd

Browse Source 
`pushd` was inside if, `popd` was outside; there was a risk of not doing a `pushd` and only doing a `popd`.

Signed-off-by: SkyLined <cojmpjum_github.com@sxd.be>
This commit is contained in:
SkyLined 2024-07-08 10:01:34 +02:00 committed by Christian König
parent 59e25d0283
commit fc73cee156
No known key found for this signature in database
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
automated install/basic-install.sh
View File

@ -378,14 +378,13 @@ is_repo() {
pushd "${directory}" &>/dev/null || return 1 pushd "${directory}" &>/dev/null || return 1
# Use git to check if the directory is a repo # Use git to check if the directory is a repo
# git -C is not used here to support git versions older than 1.8.4 # git -C is not used here to support git versions older than 1.8.4
git status --short &>/dev/null || rc=$? git status --short &> /dev/null || rc=$?
# If the command was not successful, # Move back into the directory the user started in
popd &> /dev/null || return 1
else else
# Set a non-zero return code if directory does not exist # Set a non-zero return code if directory does not exist
rc=1 rc=1
fi fi
# Move back into the directory the user started in
popd &>/dev/null || return 1
# Return the code; if one is not set, return 0 # Return the code; if one is not set, return 0
return "${rc:-0}" return "${rc:-0}"
} }