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

Pass along exit code when running a sub-script, instead of always running exit 0

Browse source
This commit is contained in:
glitch452 2021-01-23 15:58:03 -05:00
parent 9131f2754a
commit be692a8782
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
auto_install/install.sh
View file

@ -143,7 +143,7 @@ main(){
:
elif [ "$UpdateCmd" = "Update" ]; then
$SUDO ${pivpnScriptDir}/update.sh "$@"
exit 0
exit "$?"
elif [ "$UpdateCmd" = "Repair" ]; then
# shellcheck disable=SC1090
source "$setupVars"

16
scripts/openvpn/pivpn.sh
View file

@ -16,18 +16,18 @@ vpn="openvpn"
function makeOVPNFunc {
shift
$SUDO ${scriptDir}/${vpn}/makeOVPN.sh "$@"
exit 0
exit "$?"
}
function listClientsFunc {
shift
$SUDO ${scriptDir}/${vpn}/clientStat.sh "$@"
exit 0
exit "$?"
}
function listOVPNFunc {
$SUDO ${scriptDir}/${vpn}/listOVPN.sh
exit 0
exit "$?"
}
function debugFunc {
@ -37,29 +37,29 @@ function debugFunc {
echo "::: Debug output completed above."
echo "::: Copy saved to /tmp/debug.log"
echo "::: "
exit 0
exit "$?"
}
function removeOVPNFunc {
shift
$SUDO ${scriptDir}/${vpn}/removeOVPN.sh "$@"
exit 0
exit "$?"
}
function uninstallFunc {
$SUDO ${scriptDir}/uninstall.sh "${vpn}"
exit 0
exit "$?"
}
function update {
shift
$SUDO ${scriptDir}/update.sh "$@"
exit 0
exit "$?"
}
function backup {
$SUDO ${scriptDir}/backup.sh "${vpn}"
exit 0
exit "$?"
}

4
scripts/pivpn
View file

@ -14,12 +14,12 @@ scriptDir="/opt/pivpn"
uninstallServer(){
$SUDO ${scriptDir}/uninstall.sh
exit 0
exit "$?"
}
backup(){
$SUDO ${scriptDir}/backup.sh
exit 0
exit "$?"
}
showHelp(){

22
scripts/wireguard/pivpn.sh
View file

@ -16,13 +16,13 @@ vpn="wireguard"
makeConf(){
shift
$SUDO ${scriptdir}/${vpn}/makeCONF.sh "$@"
exit 0
exit "$?"
}
listConnected(){
shift
$SUDO ${scriptdir}/${vpn}/clientSTAT.sh "$@"
exit 0
exit "$?"
}
debug(){
@ -32,52 +32,52 @@ debug(){
echo "::: Debug output completed above."
echo "::: Copy saved to /tmp/debug.log"
echo "::: "
exit 0
exit "$?"
}
listClients(){
$SUDO ${scriptdir}/${vpn}/listCONF.sh
exit 0
exit "$?"
}
showQrcode(){
shift
$SUDO ${scriptdir}/${vpn}/qrcodeCONF.sh "$@"
exit 0
exit "$?"
}
removeClient(){
shift
$SUDO ${scriptdir}/${vpn}/removeCONF.sh "$@"
exit 0
exit "$?"
}
disableClient(){
shift
$SUDO ${scriptdir}/${vpn}/disableCONF.sh "$@"
exit 0
exit "$?"
}
enableClient(){
shift
$SUDO ${scriptdir}/${vpn}/enableCONF.sh "$@"
exit 0
exit "$?"
}
uninstallServer(){
$SUDO ${scriptdir}/uninstall.sh "${vpn}"
exit 0
exit "$?"
}
updateScripts(){
shift
$SUDO ${scriptdir}/update.sh "$@"
exit 0
exit "$?"
}
backup(){
$SUDO ${scriptdir}/backup.sh "${vpn}"
exit 0
exit "$?"
}
showHelp(){