From 04408f007a1d7bef4505001475c0c34637854132 Mon Sep 17 00:00:00 2001
From: decentral1se <lukewm@riseup.net>
Date: Tue, 6 Jul 2021 11:19:10 +0200
Subject: [PATCH] Fix handling of admin commands

See https://github.com/Coop-Cloud/peertube/issues/1.
See https://git.autonomic.zone/coop-cloud/abra/issues/200.
---
 abra.sh | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/abra.sh b/abra.sh
index d9e0866..a997bc0 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,24 +1,26 @@
+# shellcheck disable=SC2034,SC2145
+
 export NGINX_CONFIG_VERSION=v2
 export APP_ENTRYPOINT_VERSION=v1
 
 sub_npm() {
-  export NODE_CONFIG_DIR=/config
-  export NODE_ENV=production
-  export PEERTUBE_DB_PASSWORD=$(cat /run/secrets/db_password)
-
-  # shellcheck disable=SC2034
   abra__service_="app"
 
-  sub_app_run npm run "$@"
+  ARGS="-e NODE_CONFIG_DIR=/config -e NODE_ENV=production"
+
+  sub_app_run bash -c "\
+    export PEERTUBE_DB_PASSWORD=\$(cat /run/secrets/db_password) && \
+    npm run \"$@\" \
+  "
 }
 
 sub_prune() {
-    info "Pruning storage"
-    info "See https://docs.joinpeertube.org/maintain-tools?id=prune-storagejs for more"
-    silence
-
-    sub_npm "prune-storage"
-
+    sub_npm prune-storage
+    unsilence
+    success "Storage pruned - don't forget to restart your Peertube instance!"
+}
+
+sub_regen_thumb() {
+    sub_npm regenerate-thumbnails
     unsilence
-    success "Storage pruned!"
 }