From 70924b7416cd84faeefebf6de1fe4c37f00972ca Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Fri, 28 Mar 2025 07:58:07 +0530 Subject: [PATCH 1/2] Don't rely on the -w flag for base64 --- server/quickstart.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/quickstart.sh b/server/quickstart.sh index 82043e55b6..17f42b21d2 100755 --- a/server/quickstart.sh +++ b/server/quickstart.sh @@ -39,18 +39,18 @@ fi printf "\n - \033[1mH E L L O\033[0m - \033[1;32mE N T E\033[0m -\n\n" -gen_user_suffix () { head -c 6 /dev/urandom | base64 -w 0; } +gen_user_suffix () { head -c 6 /dev/urandom | base64 | tr -d '\n'; } -gen_password () { head -c 21 /dev/urandom | base64 -w 0; } +gen_password () { head -c 21 /dev/urandom | base64 | tr -d '\n'; } # crypto_secretbox_KEYBYTES = 32 -gen_key () { head -c 32 /dev/urandom | base64 -w 0; } +gen_key () { head -c 32 /dev/urandom | base64 | tr -d '\n'; } # crypto_generichash_BYTES_MAX = 64 -gen_hash () { head -c 64 /dev/urandom | base64 -w 0; } +gen_hash () { head -c 64 /dev/urandom | base64 | tr -d '\n'; } # Like gen_key but sodium_base64_VARIANT_URLSAFE which converts + to -, / to _ -gen_jwt_secret () { head -c 32 /dev/urandom | base64 -w 0 | tr '+/' '-_'; } +gen_jwt_secret () { head -c 32 /dev/urandom | base64 | tr -d '\n' | tr '+/' '-_'; } pg_pass=`gen_password` minio_user=minio-user-$(gen_user_suffix) From f3eb4c9acf7e74b05dcebaddf1ea787232a9423e Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Fri, 28 Mar 2025 08:10:03 +0530 Subject: [PATCH 2/2] Don't silently fail if docker is not installed --- server/quickstart.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/quickstart.sh b/server/quickstart.sh index 17f42b21d2..51402e2fc3 100755 --- a/server/quickstart.sh +++ b/server/quickstart.sh @@ -7,7 +7,11 @@ set -e -dcv=`docker compose version --short 2>/dev/null` +dcv="" +if command -v docker >/dev/null +then + dcv=`docker compose version --short 2>/dev/null` +fi if test -z "$dcv" then