From: Pablo Zmdl <redacted>
Date: Wed, 4 Dec 2024 09:05:31 +0000 (+0100)
Subject: Fix injecting enigma homedir
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=5749668130692d15eb139a5873c17b2090ab8dfa;p=roundcube-roundcubemail-docker.git

Fix injecting enigma homedir
---

diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
index 176173a..64d96b2 100755
--- a/apache/docker-entrypoint.sh
+++ b/apache/docker-entrypoint.sh
@@ -152,7 +152,7 @@ if  [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
 
   # If the "enigma" plugin is enabled but has no storage configured, inject a default value for the mandatory setting.
   if $(echo $ROUNDCUBEMAIL_PLUGINS | grep -Eq '\benigma\b') && ! grep -qr enigma_pgp_homedir /var/roundcube/config/; then
-    echo "$config['enigma_pgp_homedir'] = '/var/roundcube/enigma';" >> config/config.docker.inc.php
+    echo "\$config['enigma_pgp_homedir'] = '/var/roundcube/enigma';" >> config/config.docker.inc.php
   fi
 
   # include custom config files
diff --git a/fpm-alpine/docker-entrypoint.sh b/fpm-alpine/docker-entrypoint.sh
index 176173a..64d96b2 100755
--- a/fpm-alpine/docker-entrypoint.sh
+++ b/fpm-alpine/docker-entrypoint.sh
@@ -152,7 +152,7 @@ if  [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
 
   # If the "enigma" plugin is enabled but has no storage configured, inject a default value for the mandatory setting.
   if $(echo $ROUNDCUBEMAIL_PLUGINS | grep -Eq '\benigma\b') && ! grep -qr enigma_pgp_homedir /var/roundcube/config/; then
-    echo "$config['enigma_pgp_homedir'] = '/var/roundcube/enigma';" >> config/config.docker.inc.php
+    echo "\$config['enigma_pgp_homedir'] = '/var/roundcube/enigma';" >> config/config.docker.inc.php
   fi
 
   # include custom config files
diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
index 176173a..64d96b2 100755
--- a/fpm/docker-entrypoint.sh
+++ b/fpm/docker-entrypoint.sh
@@ -152,7 +152,7 @@ if  [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
 
   # If the "enigma" plugin is enabled but has no storage configured, inject a default value for the mandatory setting.
   if $(echo $ROUNDCUBEMAIL_PLUGINS | grep -Eq '\benigma\b') && ! grep -qr enigma_pgp_homedir /var/roundcube/config/; then
-    echo "$config['enigma_pgp_homedir'] = '/var/roundcube/enigma';" >> config/config.docker.inc.php
+    echo "\$config['enigma_pgp_homedir'] = '/var/roundcube/enigma';" >> config/config.docker.inc.php
   fi
 
   # include custom config files
diff --git a/templates/docker-entrypoint.sh b/templates/docker-entrypoint.sh
index 176173a..64d96b2 100644
--- a/templates/docker-entrypoint.sh
+++ b/templates/docker-entrypoint.sh
@@ -152,7 +152,7 @@ if  [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
 
   # If the "enigma" plugin is enabled but has no storage configured, inject a default value for the mandatory setting.
   if $(echo $ROUNDCUBEMAIL_PLUGINS | grep -Eq '\benigma\b') && ! grep -qr enigma_pgp_homedir /var/roundcube/config/; then
-    echo "$config['enigma_pgp_homedir'] = '/var/roundcube/enigma';" >> config/config.docker.inc.php
+    echo "\$config['enigma_pgp_homedir'] = '/var/roundcube/enigma';" >> config/config.docker.inc.php
   fi
 
   # include custom config files