mirror of
https://github.com/pivpn/pivpn.git
synced 2024-12-18 19:00:15 +00:00
added install.sh to change
This commit is contained in:
parent
b90077bd78
commit
e110286a13
1 changed files with 24 additions and 21 deletions
|
@ -10,11 +10,11 @@
|
|||
# curl -L https://install.pivpn.io | bash
|
||||
# Make sure you have `curl` installed
|
||||
|
||||
# timestamp 2020/5/14 15:29BST
|
||||
# timestamp 2020/5/22 12:30BST
|
||||
|
||||
######## VARIABLES #########
|
||||
pivpnGitUrl="https://github.com/pivpn/pivpn.git"
|
||||
#pivpnGitUrl="/home/ubuntu/repos/pivpn"
|
||||
#pivpnGitUrl="https://github.com/pivpn/pivpn.git"
|
||||
pivpnGitUrl="/home/pi/repos/pivpn"
|
||||
setupVarsFile="setupVars.conf"
|
||||
setupConfigDir="/etc/pivpn"
|
||||
tempsetupVarsFile="/tmp/setupVars.conf"
|
||||
|
@ -244,7 +244,7 @@ askAboutExistingInstall(){
|
|||
opt3a="Reconfigure"
|
||||
opt3b="Reinstall PiVPN with new settings"
|
||||
|
||||
UpdateCmd=$(whiptail --title "Existing Install Detected!" --menu "\nWe have detected an existing install.\n$1\n\nPlease choose from the following options:" ${r} ${c} 3 \
|
||||
UpdateCmd=$(whiptail --title "Existing Install Detected!" --menu "\nWe have detected an existing install.\n$1\n\nPlease choose from the following options (Reconfigure can be used to add a second VPN type):" ${r} ${c} 3 \
|
||||
"${opt1a}" "${opt1b}" \
|
||||
"${opt2a}" "${opt2b}" \
|
||||
"${opt3a}" "${opt3b}" 3>&2 2>&1 1>&3) || \
|
||||
|
@ -2243,7 +2243,10 @@ installScripts(){
|
|||
$SUDO install -m 755 -t ${pivpnScriptDir} ${pivpnFilesDir}/scripts/*.sh
|
||||
$SUDO install -m 755 -t ${pivpnScriptDir}/${VPN} ${pivpnFilesDir}/scripts/${VPN}/*.sh
|
||||
# make a link for a single command being installed
|
||||
# may already exist if installing the second protocol
|
||||
if [ ! -e "/usr/local/bin/pivpn" ]; then
|
||||
$SUDO ln -s -T ${pivpnScriptDir}/${VPN}/pivpn.sh /usr/local/bin/pivpn
|
||||
fi
|
||||
# if the other protocol file exists it has been installed
|
||||
if [[ ${VPN} == 'wireguard' ]]; then
|
||||
othervpn='openvpn'
|
||||
|
|
Loading…
Reference in a new issue