From dc744a9810d22b845c7ddac634cec7acdb95ca33 Mon Sep 17 00:00:00 2001 From: Orazio Date: Sat, 5 Dec 2020 12:28:14 +0100 Subject: [PATCH] Fix directory and symbolic link creation when reconfiguring (writing over the same files) --- auto_install/install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/auto_install/install.sh b/auto_install/install.sh index 8b97991..f2281f4 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -215,7 +215,7 @@ main(){ # Save installation setting to the final location echo "INSTALLED_PACKAGES=(${INSTALLED_PACKAGES[*]})" >> ${tempsetupVarsFile} echo "::: Setupfiles copied to ${setupConfigDir}/${VPN}/${setupVarsFile}" - $SUDO mkdir "${setupConfigDir}/${VPN}/" + $SUDO mkdir -p "${setupConfigDir}/${VPN}/" $SUDO cp ${tempsetupVarsFile} "${setupConfigDir}/${VPN}/${setupVarsFile}" installScripts @@ -2288,13 +2288,13 @@ installScripts(){ # Unlink the protocol specific pivpn script and symlink the common # script to the location instead $SUDO unlink /usr/local/bin/pivpn - $SUDO ln -s -T "${pivpnFilesDir}/scripts/pivpn" /usr/local/bin/pivpn + $SUDO ln -sf -T "${pivpnFilesDir}/scripts/pivpn" /usr/local/bin/pivpn else # Only one protocol is installed, symlink bash completion, the pivpn script # and the script directory - $SUDO ln -s -T "${pivpnFilesDir}/scripts/${VPN}/bash-completion" /etc/bash_completion.d/pivpn - $SUDO ln -s -T "${pivpnFilesDir}/scripts/${VPN}/pivpn.sh" /usr/local/bin/pivpn - $SUDO ln -s "${pivpnFilesDir}/scripts/" "${pivpnScriptDir}" + $SUDO ln -sf -T "${pivpnFilesDir}/scripts/${VPN}/bash-completion" /etc/bash_completion.d/pivpn + $SUDO ln -sf -T "${pivpnFilesDir}/scripts/${VPN}/pivpn.sh" /usr/local/bin/pivpn + $SUDO ln -sf "${pivpnFilesDir}/scripts/" "${pivpnScriptDir}" # shellcheck disable=SC1091 . /etc/bash_completion.d/pivpn fi