mirror of
https://github.com/pivpn/pivpn.git
synced 2024-12-18 19:00:15 +00:00
dd6bb069f0
install.sh
installScripts function:
update script not being copied over to /opt therefore update funcion was probably broken.
changed script to copy all .sh scripts from .pivpn/scripts directory.
Issue #871: fix backup script
I was probably very drunk when i first wrote this backup script.
fixed it, now works with new code refactoring,
loads vars from setupVars
Added backup for wireguard
Moved script to global pivpnscripts.
Added backup script to bash-completion
Added backup script to pivpn script
update.sh
Commented the update from master branch to avoid users trying to update test from master.
Updated LatestChages.md
108 lines
2.9 KiB
Bash
Executable file
108 lines
2.9 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
###Updates pivpn scripts (Not PiVPN)
|
|
###Main Vars
|
|
pivpnrepo="https://github.com/pivpn/pivpn.git"
|
|
pivpnlocalpath="/etc/.pivpn"
|
|
pivpnscripts="/opt/pivpn/"
|
|
bashcompletiondir="/etc/bash_completion.d/"
|
|
setupVars="/etc/pivpn/setupVars.conf"
|
|
|
|
if [ ! -f "${setupVars}" ]; then
|
|
echo "::: Missing setup vars file!"
|
|
exit 1
|
|
fi
|
|
|
|
source "${setupVars}"
|
|
|
|
###Functions
|
|
##Updates scripts
|
|
updatepivpnscripts(){
|
|
##We don't know what sort of changes users have made.
|
|
##Lets remove first /etc/.pivpn dir then clone it back again
|
|
echo "going do update PiVPN Scripts"
|
|
if [[ -d "$pivpnlocalpath" ]]; then
|
|
if [[ -n "$pivpnlocalpath" ]]; then
|
|
rm -rf "${pivpnlocalpath}/../.pivpn"
|
|
cloneandupdate
|
|
fi
|
|
else
|
|
cloneandupdate
|
|
fi
|
|
echo "PiVPN Scripts have been updated"
|
|
}
|
|
|
|
##Updates scripts using test branch
|
|
updatefromtest(){
|
|
##We don't know what sort of changes users have made.
|
|
##Lets remove first /etc/.pivpn dir then clone it back again
|
|
echo "PiVPN Scripts updating from test branch"
|
|
if [[ -d "$pivpnlocalpath" ]]; then
|
|
if [[ -n "$pivpnlocalpath" ]]; then
|
|
rm -rf "${pivpnlocalpath}/../.pivpn"
|
|
cloneupdttest
|
|
fi
|
|
else
|
|
cloneupdttest
|
|
fi
|
|
echo "PiVPN Scripts updated have been updated from test branch"
|
|
}
|
|
|
|
##Clone and copy pivpn scripts to /opt/pivpn
|
|
cloneandupdate(){
|
|
##This is to be removed after merge.
|
|
##Alert for users trying to update from master.
|
|
if [ $VPN == "wireguard" ]; then
|
|
echo "ERROR: You have installed pivpn from test branch."
|
|
echo "Wireguard not yet available on master, please use -t flag"
|
|
exit 1
|
|
fi
|
|
## Remove Above and uncomment below when test is moved to master
|
|
# git clone "$pivpnrepo" "$pivpnlocalpath"
|
|
# cp "${pivpnlocalpath}"/scripts/*.sh "$pivpnscripts"
|
|
# cp "${pivpnlocalpath}"/scripts/$VPN/*.sh "$pivpnscripts"
|
|
# cp "${pivpnlocalpath}"/scripts/$VPN/bash-completion "$bashcompletiondir"
|
|
}
|
|
|
|
##same as cloneandupdate() but from test branch
|
|
##and falls back to master branch again after updating
|
|
cloneupdttest(){
|
|
git clone "$pivpnrepo" "$pivpnlocalpath"
|
|
git -C "$pivpnlocalpath" checkout test
|
|
git -C "$pivpnlocalpath" pull origin test
|
|
cp "${pivpnlocalpath}"/scripts/*.sh "$pivpnscripts"
|
|
cp "${pivpnlocalpath}"/scripts/$VPN/*.sh "$pivpnscripts"
|
|
cp "${pivpnlocalpath}"/scripts/$VPN/bash-completion "$bashcompletiondir"
|
|
git -C "$pivpnlocalpath" checkout master
|
|
}
|
|
|
|
scriptusage(){
|
|
echo -e "Updates pivpn scripts,
|
|
|
|
Usage:
|
|
pivpn update | updates from master branch
|
|
pivpn update -t or --test | updates from test branch"
|
|
}
|
|
|
|
## SCRIPT
|
|
|
|
if [[ $# -eq 0 ]]; then
|
|
updatepivpnscripts
|
|
else
|
|
while true; do
|
|
case "$1" in
|
|
-t|--test|test)
|
|
updatefromtest
|
|
exit 0
|
|
;;
|
|
-h|--help|help)
|
|
scriptusage
|
|
exit 0
|
|
;;
|
|
* )
|
|
updatepivpnscripts
|
|
exit 0
|
|
;;
|
|
esac
|
|
done
|
|
fi
|