Merge pull request #156 from linuxserver/quotes

wrap .env values in quotes

Author: aptalca

README.md

@@ -276,6 +276,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **16.01.23:** - Wrap `.env` values in quotes.
 * **05.01.23:** - Fix db password setting (sed escape `&`).
 * **21.12.22:** - Update db info in .env file when env vars are updated.
 * **10.10.22:** - Remove password escape logic which caused problems for a small subset of users.

readme-vars.yml

@@ -104,6 +104,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "16.01.23:", desc: "Wrap `.env` values in quotes." }
   - { date: "05.01.23:", desc: "Fix db password setting (sed escape `&`)." }
   - { date: "21.12.22:", desc: "Update db info in .env file when env vars are updated." }
   - { date: "10.10.22:", desc: "Remove password escape logic which caused problems for a small subset of users." }

root/etc/cont-init.d/50-config

@@ -85,15 +85,15 @@ if [[ -n "${DB_HOST}" ]]; then
 
     if ! grep -xqE "^[#]?DB_PORT=.*" /config/www/.env; then
         # add DB_PORT line to /config/www/.env because current /app/www/.env.example doesn't have it
-        sed -i -E "/^[#]?DB_HOST=.*/a DB_PORT=${DB_PORT}" /config/www/.env
-        echo "**** Insert DB_PORT=${DB_PORT} into /config/www/.env ****"
+        sed -i -E "/^[#]?DB_HOST=.*/a DB_PORT='${DB_PORT}'" /config/www/.env
+        echo "**** Insert DB_PORT='${DB_PORT}' into /config/www/.env ****"
     fi
 
-    sed -i -E "s/^[#]?DB_HOST=.*/DB_HOST=${DB_HOST}/g" /config/www/.env
-    sed -i -E "s/^[#]?DB_PORT=.*/DB_PORT=${DB_PORT}/g" /config/www/.env
-    sed -i -E "s/^[#]?DB_DATABASE=.*/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env
-    sed -i -E "s/^[#]?DB_USERNAME=.*/DB_USERNAME=${DB_USER}/g" /config/www/.env
-    sed -i -E "s/^[#]?DB_PASSWORD=.*/DB_PASSWORD=${DB_PASS//&/\\&}/g" /config/www/.env
+    sed -i -E "s/^[#]?DB_HOST=.*/DB_HOST='${DB_HOST}'/g" /config/www/.env
+    sed -i -E "s/^[#]?DB_PORT=.*/DB_PORT='${DB_PORT}'/g" /config/www/.env
+    sed -i -E "s/^[#]?DB_DATABASE=.*/DB_DATABASE='${DB_DATABASE}'/g" /config/www/.env
+    sed -i -E "s/^[#]?DB_USERNAME=.*/DB_USERNAME='${DB_USER}'/g" /config/www/.env
+    sed -i -E "s/^[#]?DB_PASSWORD=.*/DB_PASSWORD='${DB_PASS//&/\\&}'/g" /config/www/.env
 fi
 
 # set appurl