mirror of
https://github.com/pivpn/pivpn.git
synced 2024-12-19 11:20:15 +00:00
Shellcheck compliance
scripts/backup.sh * Fixes SC1090: ShellCheck can't follow non-constant source. Use a directive to specify location. * Fixes SC2086: Double quote to prevent globbing and word splitting. * Disabled warning for SC1090 * Added missing double quotes
This commit is contained in:
parent
57cc772d18
commit
685133bc00
1 changed files with 6 additions and 4 deletions
|
@ -42,6 +42,7 @@ if [ ! -f "${setupVars}" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# shellcheck disable=SC1090
|
||||||
source "${setupVars}"
|
source "${setupVars}"
|
||||||
|
|
||||||
scriptusage(){
|
scriptusage(){
|
||||||
|
@ -70,6 +71,7 @@ updatepivpnscripts(){
|
||||||
cloneandupdate
|
cloneandupdate
|
||||||
fi
|
fi
|
||||||
echo "PiVPN Scripts have been updated"
|
echo "PiVPN Scripts have been updated"
|
||||||
|
# Disabling warning for SC1090
|
||||||
}
|
}
|
||||||
|
|
||||||
##Updates scripts using test branch
|
##Updates scripts using test branch
|
||||||
|
@ -92,8 +94,8 @@ updatefromtest(){
|
||||||
cloneandupdate(){
|
cloneandupdate(){
|
||||||
git clone "$pivpnrepo" "$pivpnlocalpath"
|
git clone "$pivpnrepo" "$pivpnlocalpath"
|
||||||
cp "${pivpnlocalpath}"/scripts/*.sh "$pivpnscripts"
|
cp "${pivpnlocalpath}"/scripts/*.sh "$pivpnscripts"
|
||||||
cp "${pivpnlocalpath}"/scripts/$VPN/*.sh "$pivpnscripts"
|
cp "${pivpnlocalpath}"/scripts/"$VPN"/*.sh "$pivpnscripts"
|
||||||
cp "${pivpnlocalpath}"/scripts/$VPN/bash-completion "$bashcompletiondir"
|
cp "${pivpnlocalpath}"/scripts/"$VPN"/bash-completion "$bashcompletiondir"
|
||||||
}
|
}
|
||||||
|
|
||||||
##same as cloneandupdate() but from test branch
|
##same as cloneandupdate() but from test branch
|
||||||
|
@ -103,8 +105,8 @@ cloneupdttest(){
|
||||||
git -C "$pivpnlocalpath" checkout test
|
git -C "$pivpnlocalpath" checkout test
|
||||||
git -C "$pivpnlocalpath" pull origin test
|
git -C "$pivpnlocalpath" pull origin test
|
||||||
cp "${pivpnlocalpath}"/scripts/*.sh "$pivpnscripts"
|
cp "${pivpnlocalpath}"/scripts/*.sh "$pivpnscripts"
|
||||||
cp "${pivpnlocalpath}"/scripts/$VPN/*.sh "$pivpnscripts"
|
cp "${pivpnlocalpath}"/scripts/"$VPN"/*.sh "$pivpnscripts"
|
||||||
cp "${pivpnlocalpath}"/scripts/$VPN/bash-completion "$bashcompletiondir"
|
cp "${pivpnlocalpath}"/scripts/"$VPN"/bash-completion "$bashcompletiondir"
|
||||||
git -C "$pivpnlocalpath" checkout master
|
git -C "$pivpnlocalpath" checkout master
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue