From 31a0a8e74f75a4ee268ef26a844b1539a4f5eee4 Mon Sep 17 00:00:00 2001 From: Kaladin Light <0.kaladin@gmail.com> Date: Tue, 6 Dec 2016 21:57:00 -0500 Subject: [PATCH] Revert "fix-159" This reverts commit 96bef0c08563a6d9ea43fa1efccbb33b6e223684. --- auto_install/install.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/auto_install/install.sh b/auto_install/install.sh index 567cab3..29cc897 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -18,7 +18,7 @@ pivpnFilesDir="/etc/.pivpn" easyrsaRel="https://github.com/pivpn/easy-rsa/releases/download/3.0.1-pivpn/EasyRSA-3.0.1-pivpn.tgz" # Find the rows and columns. Will default to 80x24 if it can not be detected. -screen_size=$(stty size 2>/dev/null || echo 24 80) +screen_size=$(stty size 2>/dev/null || echo 24 80) rows=$(echo $screen_size | awk '{print $1}') columns=$(echo $screen_size | awk '{print $2}') @@ -203,7 +203,7 @@ verifyFreeDiskSpace() { *) echo "::: Confirmation not received, exiting..." exit 1 - ;; + ;; esac # - Insufficient free disk space elif [[ ${existing_free_kilobytes} -lt ${required_free_kilobytes} ]]; then @@ -319,8 +319,6 @@ It is also possible to use a DHCP reservation, but if you are going to do that, } setDHCPCD() { - # First, create the dhcpd config file - touch ${dhcpcdFile} # Append these lines to dhcpcd.conf to enable a static IP echo "## interface ${pivpnInterface} static ip_address=${IPv4addr} @@ -330,7 +328,7 @@ setDHCPCD() { setStaticIPv4() { # Tries to set the IPv4 address - if [[ -f ${dhcpcdFile} ]]; then + if [[ -f /etc/dhcpcd.conf ]]; then if grep -q "${IPv4addr}" ${dhcpcdFile}; then echo "::: Static IP already configured." :