Cleanup

run.sh

@@ -52,22 +52,22 @@ vpn_gen_env="/opt/src/vpn-gen.env"
 if [ -z "$VPN_IPSEC_PSK" ] && [ -z "$VPN_USER" ] && [ -z "$VPN_PASSWORD" ]; then
   if [ -f "$vpn_env" ]; then
     echo
-    echo "Retrieving VPN credentials..."
+    echo 'Retrieving VPN credentials...'
     . "$vpn_env"
   elif [ -f "$vpn_gen_env" ]; then
     echo
-    echo "Retrieving previously generated VPN credentials..."
+    echo 'Retrieving previously generated VPN credentials...'
     . "$vpn_gen_env"
   else
     echo
-    echo "VPN credentials not set by user. Generating random PSK and password..."
+    echo 'VPN credentials not set by user. Generating random PSK and password...'
     VPN_IPSEC_PSK="$(LC_CTYPE=C tr -dc 'A-HJ-NPR-Za-km-z2-9' < /dev/urandom | head -c 20)"
     VPN_USER=vpnuser
     VPN_PASSWORD="$(LC_CTYPE=C tr -dc 'A-HJ-NPR-Za-km-z2-9' < /dev/urandom | head -c 16)"
 
-    echo "VPN_IPSEC_PSK=$VPN_IPSEC_PSK" > "$vpn_gen_env"
-    echo "VPN_USER=$VPN_USER" >> "$vpn_gen_env"
-    echo "VPN_PASSWORD=$VPN_PASSWORD" >> "$vpn_gen_env"
+    printf '%s\n' "VPN_IPSEC_PSK='$VPN_IPSEC_PSK'" > "$vpn_gen_env"
+    printf '%s\n' "VPN_USER='$VPN_USER'" >> "$vpn_gen_env"
+    printf '%s\n' "VPN_PASSWORD='$VPN_PASSWORD'" >> "$vpn_gen_env"
     chmod 600 "$vpn_gen_env"
   fi
 fi