zf

commit 28e82581335c941711aa7573cd7ed5ef7ebe0293
parent 3b7dd2ca8587afd16cdd0f4b33cb2520ceba67ed
Author: srfsh <dev@srf.sh>
Date:   Wed, 17 Aug 2022 11:32:22 +0300

mann: use "@" to markup substitutable vars

It is easier to spot and makes the sed(1) expression easier to grasp.

Diffstat:
M
mann
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mann b/mann
@@ -183,7 +183,7 @@ cmd_env_setup() {
 	else
 		key=$(openssl rand -hex 64)
 		salt=$(openssl rand -hex 64)
-		sed 's,$ADMIN_KEY,'"$key"', ; s,$ROOM_SALT,'"$salt"',' conf/.env.templ >conf/env.sh
+		sed 's,@ADMIN_KEY,'"$key"', ; s,@ROOM_SALT,'"$salt"',' conf/.env.templ >conf/env.sh
 		warn "the 'conf/env.sh' file is generated, please edit it to suit your needs"
 	fi
 }
@@ -271,9 +271,9 @@ cmd_devop_setup() {
 		admin_key=$(openssl rand -hex 64)
 		db_pass=$(openssl rand -hex 16)
 		room_salt=$(openssl rand -base64 64 | tr -d \\n)
-		sed 's,$ADMIN_KEY,'"$admin_key"', ;
-		     s,$DB_PASS,'"$db_pass"', ;
-		     s,$ROOM_SALT,'"$room_salt"',' devop/.docker-compose.templ >devop/docker-compose.yml
+		sed 's,@ADMIN_KEY,'"$admin_key"', ;
+		     s,@DB_PASS,'"$db_pass"', ;
+		     s,@ROOM_SALT,'"$room_salt"',' devop/.docker-compose.templ >devop/docker-compose.yml
 		warn "the 'devop/docker-compose.yml' file is generated, please edit it to suit your needs"
 	fi
 }