From 0443ffc984adb3f736491fd2746dbeac43e6cad4 Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Sun, 28 Apr 2024 17:55:55 +0200
Subject: [PATCH 1/2] chore: remove tabs

---
 entrypoint.sh.tmpl | 50 +++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index bcf8e07..7a677fe 100644
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -1,35 +1,35 @@
 #!/usr/bin/env bash
 
 file_env() {
-	# 3wc: Load $VAR_FILE into $VAR - useful for secrets. See
-	# 	https://medium.com/@adrian.gheorghe.dev/using-docker-secrets-in-your-environment-variables-7a0609659aab
-	local var="$1"
-	local fileVar="${var}_FILE"
-	local def="${2:-}"
+  # 3wc: Load $VAR_FILE into $VAR - useful for secrets. See
+  #   https://medium.com/@adrian.gheorghe.dev/using-docker-secrets-in-your-environment-variables-7a0609659aab
+  local var="$1"
+  local fileVar="${var}_FILE"
+  local def="${2:-}"
 
-	if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
-		echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
-		exit 1
-	fi
-	local val="$def"
-	if [ "${!var:-}" ]; then
-		val="${!var}"
-	elif [ "${!fileVar:-}" ]; then
-		val="$(< "${!fileVar}")"
-	fi
-	export "$var"="$val"
-	unset "$fileVar"
+  if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
+    echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
+    exit 1
+  fi
+  local val="$def"
+  if [ "${!var:-}" ]; then
+    val="${!var}"
+  elif [ "${!fileVar:-}" ]; then
+    val="$(< "${!fileVar}")"
+  fi
+  export "$var"="$val"
+  unset "$fileVar"
 }
 
 load_vars() {
-	file_env "CMD_DB_PASSWORD"
-	file_env "CMD_OAUTH2_CLIENT_SECRET"
+  file_env "CMD_DB_PASSWORD"
+  file_env "CMD_OAUTH2_CLIENT_SECRET"
 }
 
 main() {
-	set -eu
+  set -eu
 
-	load_vars
+  load_vars
   mkdir "/hedgedoc/.npm" && chown -R 10000:65534 "/hedgedoc/.npm" && chmod "u+rwx" "/hedgedoc/.npm"
 }
 
@@ -39,10 +39,10 @@ export CMD_DB_URL=postgres://$CMD_DB_USER:$CMD_DB_PASSWORD@$CMD_DB_HOST:5432/$CM
 
 # 3wc: `source /docker-entrypoint2.sh -e` to load CMD_DB_URL for CLI scripts
 if [ ! "${1-}" == "-e" ]; then
-	# 3wc: upstream ENTRYPOINT
-	# https://github.com/hedgedoc/container/blob/master/alpine/Dockerfile
-	 mkdir -p "/hedgedoc/.npm" && chown -R 10000:65534 "/hedgedoc/.npm"
-	/usr/local/bin/docker-entrypoint.sh npm start
+  # 3wc: upstream ENTRYPOINT
+  # https://github.com/hedgedoc/container/blob/master/alpine/Dockerfile
+   mkdir -p "/hedgedoc/.npm" && chown -R 10000:65534 "/hedgedoc/.npm"
+  /usr/local/bin/docker-entrypoint.sh npm start
 fi
 
 set +eu

From 1ed15423c36619a265e75626609b7c093039d681 Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Sun, 28 Apr 2024 17:56:47 +0200
Subject: [PATCH 2/2] fix: pass "-p" and use new lines

Closes https://git.coopcloud.tech/coop-cloud/hedgedoc/issues/13
---
 abra.sh            | 2 +-
 entrypoint.sh.tmpl | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/abra.sh b/abra.sh
index 76461a6..2c0906c 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
-export ENTRYPOINT_CONF_VERSION=v8
+export ENTRYPOINT_CONF_VERSION=v9
 
 abra_backup_app() {
   _abra_backup_dir "app:/home/hackmd/app/public/uploads/"
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index 7a677fe..b6fc9cf 100644
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -30,7 +30,9 @@ main() {
   set -eu
 
   load_vars
-  mkdir "/hedgedoc/.npm" && chown -R 10000:65534 "/hedgedoc/.npm" && chmod "u+rwx" "/hedgedoc/.npm"
+  mkdir -p "/hedgedoc/.npm" && \
+    chown -R 10000:65534 "/hedgedoc/.npm" && \
+    chmod "u+rwx" "/hedgedoc/.npm"
 }
 
 main