Pi-hole/pivpn
Pi-hole/pivpn
1
0
Fork 0
mirror of https://github.com/pivpn/pivpn.git synced 2024-12-20 03:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

set -e and set +e around line 800 to 815

Browse source 
I am not sure why this statement does not work with -e. We can also
remove the set -e statement altogether.
This commit is contained in:
EWouters 2017-03-14 15:39:07 +13:00
parent 7315353179
commit 097145392c
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
auto_install/install.sh
View file

@ -798,6 +798,7 @@ confOpenVPN() {
$SUDO mkdir /etc/openvpn/easy-rsa/pki $SUDO mkdir /etc/openvpn/easy-rsa/pki
# Write out new vars file # Write out new vars file
set +e
IFS= read -d '' String <<"EOF" IFS= read -d '' String <<"EOF"
if [ -z "$EASYRSA_CALLER" ]; then if [ -z "$EASYRSA_CALLER" ]; then
echo "Nope." >&2 echo "Nope." >&2
@ -811,6 +812,7 @@ set_var EASYRSA_CURVE secp384r1
EOF EOF
echo "${String}" | $SUDO tee /etc/openvpn/easy-rsa/vars >/dev/null echo "${String}" | $SUDO tee /etc/openvpn/easy-rsa/vars >/dev/null
set -e
# Edit the KEY_SIZE variable in the vars file to set user chosen key size # Edit the KEY_SIZE variable in the vars file to set user chosen key size
cd /etc/openvpn/easy-rsa || exit cd /etc/openvpn/easy-rsa || exit
@ -1266,6 +1268,7 @@ main() {
echo "${pivpnProto}" > /tmp/pivpnPROTO echo "${pivpnProto}" > /tmp/pivpnPROTO
echo "::: Using port: $PORT" echo "::: Using port: $PORT"
echo ${PORT} > /tmp/INSTALL_PORT echo ${PORT} > /tmp/INSTALL_PORT
echo ":::"
# Only try to set static on Raspbian # Only try to set static on Raspbian
if [[ $PLAT != "Raspbian" ]]; then if [[ $PLAT != "Raspbian" ]]; then