Use xargs to run modification script, plus some syntax updates #1334
This commit is contained in:
		| @@ -18,5 +18,5 @@ CONFIG_MOD_USERPASS=${CONFIG_MOD_USERPASS:-"1"} | ||||
| ## Option 1 - Change the auth-user-pass line to point to credentials file | ||||
| if [[ $CONFIG_MOD_USERPASS == "1" ]]; then | ||||
|     [[ "${DEBUG}" == "true" ]] && echo "Point auth-user-pass option to the username/password file" | ||||
|     sed -i "s/auth-user-pass/auth-user-pass \/config\/openvpn-credentials.txt/" "$CONFIG" | ||||
|     sed -i "s#auth-user-pass#auth-user-pass /config/openvpn-credentials.txt#g" "$CONFIG" | ||||
| fi | ||||
|   | ||||
| @@ -28,7 +28,7 @@ echo "Extract OpenVPN config bundle into PIA directory $VPN_PROVIDER_HOME" | ||||
| unzip -qjo "$tmp_file" -d "$VPN_PROVIDER_HOME" | ||||
|  | ||||
| echo "Modify configs for this container" | ||||
| find "$VPN_PROVIDER_HOME" -type f -name "*.ovpn" -exec /etc/openvpn/modify-openvpn-config.sh {} \; | ||||
| find "$VPN_PROVIDER_HOME" -type f -name "*.ovpn" -print0 | xargs -n 1 -r0 /etc/openvpn/modify-openvpn-config.sh | ||||
|  | ||||
| # Select a random server as default.ovpn | ||||
| ln -sf "$(find "$VPN_PROVIDER_HOME" -name "*.ovpn" | shuf -n 1)" "$VPN_PROVIDER_HOME"/default.ovpn | ||||
|   | ||||
| @@ -18,7 +18,7 @@ if compgen -e | grep -q "OVERRIDE_DNS"; then | ||||
|     echo "One or more OVERRIDE_DNS addresses found. Will use them to overwrite /etc/resolv.conf" | ||||
|     echo "" > /etc/resolv.conf | ||||
|     for var in $(compgen -e | grep "OVERRIDE_DNS"); do | ||||
|         echo "nameserver $(printenv $var)" >> /etc/resolv.conf | ||||
|         echo "nameserver $(printenv "$var")" >> /etc/resolv.conf | ||||
|     done | ||||
| fi | ||||
|  | ||||
| @@ -53,7 +53,7 @@ if [[ -n $OPENVPN_CONFIG_URL ]]; then | ||||
|   CHOSEN_OPENVPN_CONFIG=$VPN_PROVIDER_HOME/downloaded_config.ovpn | ||||
|   curl -o "$CHOSEN_OPENVPN_CONFIG" -sSL "$OPENVPN_CONFIG_URL" | ||||
|   # shellcheck source=openvpn/modify-openvpn-config.sh | ||||
|   /etc/openvpn/modify-openvpn-config.sh $CHOSEN_OPENVPN_CONFIG | ||||
|   /etc/openvpn/modify-openvpn-config.sh "$CHOSEN_OPENVPN_CONFIG" | ||||
| elif [[ -x $VPN_PROVIDER_HOME/configure-openvpn.sh ]]; then | ||||
|   echo "Provider $OPENVPN_PROVIDER has a custom startup script, executing it" | ||||
|   # shellcheck source=/dev/null | ||||
|   | ||||
		Reference in New Issue
	
	Block a user