diff --git a/build_key-pass.sh b/build_key-pass.sh index 9304947..09b7f4a 100755 --- a/build_key-pass.sh +++ b/build_key-pass.sh @@ -663,6 +663,7 @@ EOF # - If the configuration file contains all keys/certs, only the configuration file # - with its suffix '.ovpn' is needed. # - + _failed=false echononl " Create zip archive '${KEY_CN}-${NEW_KEY_NAME}.tblk.zip' for MAC OS .." target_macos_tblk_dir="${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}/${KEY_CN}-${NEW_KEY_NAME}.tblk" mkdir "$target_macos_tblk_dir" > $log_file 2>&1 @@ -699,6 +700,12 @@ EOF if [[ $? -ne 0 ]] ; then _failed=true fi + if $_failed ; then + echo_failed + error "$(cat $log_file)" + else + echo_ok + fi fi diff --git a/install_openvpn.sh b/install_openvpn.sh index 6ec3fa7..29aef93 100755 --- a/install_openvpn.sh +++ b/install_openvpn.sh @@ -234,7 +234,7 @@ echo "Insert IP-Address/Hostname of OpenVPN Server" echo "" OPENVPN_SERVER="" if [[ -n "$DEFAULT_SERVER" ]] ; then - echononl "Server Port [${DEFAULT_SERVER}]: " + echononl "OpenVPN Server [${DEFAULT_SERVER}]: " read OPENVPN_SERVER if [[ "X$OPENVPN_SERVER" = "X" ]]; then OPENVPN_SERVER="$DEFAULT_SERVER"