From 2c304978d11884fdf0a264c0c738173e9a407f54 Mon Sep 17 00:00:00 2001
From: Dan Mills <dmills@qumulo.com>
Date: Fri, 7 Feb 2025 17:25:09 -0800
Subject: [PATCH 1/7] Fix filebrowser config

---
 filebrowser/run.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/filebrowser/run.sh b/filebrowser/run.sh
index d6afea02..4d35b826 100644
--- a/filebrowser/run.sh
+++ b/filebrowser/run.sh
@@ -11,7 +11,7 @@ fi
 
 printf "🥳 Installation complete! \n\n"
 
-printf "👷 Starting filebrowser in background... \n\n"
+printf "🛠️  Configuring filebrowser \n\n"
 
 ROOT_DIR=${FOLDER}
 ROOT_DIR=$${ROOT_DIR/\~/$HOME}
@@ -21,10 +21,20 @@ if [ "${DB_PATH}" != "filebrowser.db" ]; then
   DB_FLAG=" -d ${DB_PATH}"
 fi
 
+# Check if filebrowser db exists
+if [ ! -f ${DB_PATH} ]; then
+  filebrowser $DB_FLAG config init > ${LOG_PATH} 2>&1
+  filebrowser $DB_FLAG config set  --baseurl ${SERVER_BASE_PATH} --port ${PORT} --auth.method=noauth --root $ROOT_DIR > ${LOG_PATH} 2>&1
+  filebrowser $DB_FLAG users add admin "" --perm.admin=true > ${LOG_PATH} 2>&1
+fi
+
+printf "👷 Starting filebrowser in background... \n\n"
+
+
 printf "📂 Serving $${ROOT_DIR} at http://localhost:${PORT} \n\n"
 
-printf "Running 'filebrowser --noauth --root $ROOT_DIR --port ${PORT}$${DB_FLAG} --baseurl ${SERVER_BASE_PATH}' \n\n"
+printf "Running 'filebrowser $DB_FLAG' \n\n"
 
-filebrowser --noauth --root $ROOT_DIR --port ${PORT}$${DB_FLAG} --baseurl ${SERVER_BASE_PATH} > ${LOG_PATH} 2>&1 &
+filebrowser $DB_FLAG > ${LOG_PATH} 2>&1 &
 
 printf "📝 Logs at ${LOG_PATH} \n\n"

From 462a79fa530cea08a5695e6b4e62719fa1086ea6 Mon Sep 17 00:00:00 2001
From: Dan Mills <dmills@qumulo.com>
Date: Fri, 7 Feb 2025 17:33:51 -0800
Subject: [PATCH 2/7] Append log

---
 filebrowser/run.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/filebrowser/run.sh b/filebrowser/run.sh
index 4d35b826..2aaf31fd 100644
--- a/filebrowser/run.sh
+++ b/filebrowser/run.sh
@@ -23,9 +23,9 @@ fi
 
 # Check if filebrowser db exists
 if [ ! -f ${DB_PATH} ]; then
-  filebrowser $DB_FLAG config init > ${LOG_PATH} 2>&1
-  filebrowser $DB_FLAG config set  --baseurl ${SERVER_BASE_PATH} --port ${PORT} --auth.method=noauth --root $ROOT_DIR > ${LOG_PATH} 2>&1
-  filebrowser $DB_FLAG users add admin "" --perm.admin=true > ${LOG_PATH} 2>&1
+  filebrowser $DB_FLAG config init >> ${LOG_PATH} 2>&1
+  filebrowser $DB_FLAG config set --baseurl ${SERVER_BASE_PATH} --port ${PORT} --auth.method=noauth --root $ROOT_DIR >> ${LOG_PATH} 2>&1
+  filebrowser $DB_FLAG users add admin "" --perm.admin=true >> ${LOG_PATH} 2>&1
 fi
 
 printf "👷 Starting filebrowser in background... \n\n"
@@ -35,6 +35,6 @@ printf "📂 Serving $${ROOT_DIR} at http://localhost:${PORT} \n\n"
 
 printf "Running 'filebrowser $DB_FLAG' \n\n"
 
-filebrowser $DB_FLAG > ${LOG_PATH} 2>&1 &
+filebrowser $DB_FLAG >> ${LOG_PATH} 2>&1 &
 
 printf "📝 Logs at ${LOG_PATH} \n\n"

From fb156fadbea442e9475dbcbc2496a780480aebb9 Mon Sep 17 00:00:00 2001
From: Dan Mills <dmills@qumulo.com>
Date: Fri, 7 Feb 2025 17:37:43 -0800
Subject: [PATCH 3/7] Update config line

---
 filebrowser/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filebrowser/run.sh b/filebrowser/run.sh
index 2aaf31fd..cdfe8cde 100644
--- a/filebrowser/run.sh
+++ b/filebrowser/run.sh
@@ -24,7 +24,7 @@ fi
 # Check if filebrowser db exists
 if [ ! -f ${DB_PATH} ]; then
   filebrowser $DB_FLAG config init >> ${LOG_PATH} 2>&1
-  filebrowser $DB_FLAG config set --baseurl ${SERVER_BASE_PATH} --port ${PORT} --auth.method=noauth --root $ROOT_DIR >> ${LOG_PATH} 2>&1
+  filebrowser $DB_FLAG config set --baseurl=${SERVER_BASE_PATH} --port=${PORT} --auth.method=noauth --root=$ROOT_DIR >> ${LOG_PATH} 2>&1
   filebrowser $DB_FLAG users add admin "" --perm.admin=true >> ${LOG_PATH} 2>&1
 fi
 

From 36dc8521a84bd9195b4474b87e924dff8ba6a541 Mon Sep 17 00:00:00 2001
From: Dan Mills <dmills@qumulo.com>
Date: Fri, 7 Feb 2025 17:41:45 -0800
Subject: [PATCH 4/7] Allow changing config on each run

---
 filebrowser/run.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/filebrowser/run.sh b/filebrowser/run.sh
index cdfe8cde..d6fc48ff 100644
--- a/filebrowser/run.sh
+++ b/filebrowser/run.sh
@@ -24,10 +24,11 @@ fi
 # Check if filebrowser db exists
 if [ ! -f ${DB_PATH} ]; then
   filebrowser $DB_FLAG config init >> ${LOG_PATH} 2>&1
-  filebrowser $DB_FLAG config set --baseurl=${SERVER_BASE_PATH} --port=${PORT} --auth.method=noauth --root=$ROOT_DIR >> ${LOG_PATH} 2>&1
-  filebrowser $DB_FLAG users add admin "" --perm.admin=true >> ${LOG_PATH} 2>&1
+  filebrowser $DB_FLAG users add admin "" --perm.admin=true --viewMode=mosaic >> ${LOG_PATH} 2>&1
 fi
 
+filebrowser $DB_FLAG config set --baseurl=${SERVER_BASE_PATH} --port=${PORT} --auth.method=noauth --root=$ROOT_DIR >> ${LOG_PATH} 2>&1
+
 printf "👷 Starting filebrowser in background... \n\n"
 
 

From 4d7af0cf23410208dea8a367c7a425efdebbadf2 Mon Sep 17 00:00:00 2001
From: Dan Mills <evilhamsterman@gmail.com>
Date: Thu, 6 Mar 2025 19:08:13 -0800
Subject: [PATCH 5/7] Apply suggestions

---
 filebrowser/run.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/filebrowser/run.sh b/filebrowser/run.sh
index d6fc48ff..9cee3429 100644
--- a/filebrowser/run.sh
+++ b/filebrowser/run.sh
@@ -23,18 +23,18 @@ fi
 
 # Check if filebrowser db exists
 if [ ! -f ${DB_PATH} ]; then
-  filebrowser $DB_FLAG config init >> ${LOG_PATH} 2>&1
-  filebrowser $DB_FLAG users add admin "" --perm.admin=true --viewMode=mosaic >> ${LOG_PATH} 2>&1
+  filebrowser $DB_FLAG config init  2>&1 | tee -a ${LOG_PATH}
+  filebrowser $DB_FLAG users add admin "" --perm.admin=true --viewMode=mosaic 2>&1 | tee -a ${LOG_PATH} 
 fi
 
-filebrowser $DB_FLAG config set --baseurl=${SERVER_BASE_PATH} --port=${PORT} --auth.method=noauth --root=$ROOT_DIR >> ${LOG_PATH} 2>&1
+filebrowser $DB_FLAG config set --baseurl=${SERVER_BASE_PATH} --port=${PORT} --auth.method=noauth --root=$ROOT_DIR 2>&1 | tee -a ${LOG_PATH} 
 
 printf "👷 Starting filebrowser in background... \n\n"
 
 
 printf "📂 Serving $${ROOT_DIR} at http://localhost:${PORT} \n\n"
 
-printf "Running 'filebrowser $DB_FLAG' \n\n"
+printf "Running 'filebrowser %s' \n\n" "$DB_FLAG"
 
 filebrowser $DB_FLAG >> ${LOG_PATH} 2>&1 &
 

From 9acc25c4668a325ca090405f392075089796cf7f Mon Sep 17 00:00:00 2001
From: Dan Mills <evilhamsterman@gmail.com>
Date: Thu, 6 Mar 2025 19:11:48 -0800
Subject: [PATCH 6/7] Switch to double square brackets

---
 filebrowser/run.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/filebrowser/run.sh b/filebrowser/run.sh
index 9cee3429..ebdcb8c8 100644
--- a/filebrowser/run.sh
+++ b/filebrowser/run.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BOLD='\033[0;1m'
+BOLD='\033[[0;1m'
 
 printf "$${BOLD}Installing filebrowser \n\n"
 
@@ -17,12 +17,12 @@ ROOT_DIR=${FOLDER}
 ROOT_DIR=$${ROOT_DIR/\~/$HOME}
 
 DB_FLAG=""
-if [ "${DB_PATH}" != "filebrowser.db" ]; then
+if [[ "${DB_PATH}" != "filebrowser.db" ]]; then
   DB_FLAG=" -d ${DB_PATH}"
 fi
 
 # Check if filebrowser db exists
-if [ ! -f ${DB_PATH} ]; then
+if [[ ! -f ${DB_PATH} ]]; then
   filebrowser $DB_FLAG config init  2>&1 | tee -a ${LOG_PATH}
   filebrowser $DB_FLAG users add admin "" --perm.admin=true --viewMode=mosaic 2>&1 | tee -a ${LOG_PATH} 
 fi

From 36450ff1212c88cbfb0e9d2bb36383a7ea38544e Mon Sep 17 00:00:00 2001
From: Dan Mills <evilhamsterman@gmail.com>
Date: Thu, 6 Mar 2025 19:53:16 -0800
Subject: [PATCH 7/7] Use FB_DATABASE instead of DB_FLAG

---
 filebrowser/run.sh | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/filebrowser/run.sh b/filebrowser/run.sh
index ebdcb8c8..b8927582 100644
--- a/filebrowser/run.sh
+++ b/filebrowser/run.sh
@@ -16,26 +16,22 @@ printf "🛠️  Configuring filebrowser \n\n"
 ROOT_DIR=${FOLDER}
 ROOT_DIR=$${ROOT_DIR/\~/$HOME}
 
-DB_FLAG=""
-if [[ "${DB_PATH}" != "filebrowser.db" ]]; then
-  DB_FLAG=" -d ${DB_PATH}"
-fi
+echo "DB_PATH: ${DB_PATH}"
+
+export FB_DATABASE="${DB_PATH}"
 
 # Check if filebrowser db exists
-if [[ ! -f ${DB_PATH} ]]; then
-  filebrowser $DB_FLAG config init  2>&1 | tee -a ${LOG_PATH}
-  filebrowser $DB_FLAG users add admin "" --perm.admin=true --viewMode=mosaic 2>&1 | tee -a ${LOG_PATH} 
+if [[ ! -f "${DB_PATH}" ]]; then
+  filebrowser config init  2>&1 | tee -a ${LOG_PATH}
+  filebrowser users add admin "" --perm.admin=true --viewMode=mosaic 2>&1 | tee -a ${LOG_PATH} 
 fi
 
-filebrowser $DB_FLAG config set --baseurl=${SERVER_BASE_PATH} --port=${PORT} --auth.method=noauth --root=$ROOT_DIR 2>&1 | tee -a ${LOG_PATH} 
+filebrowser config set --baseurl=${SERVER_BASE_PATH} --port=${PORT} --auth.method=noauth --root=$ROOT_DIR 2>&1 | tee -a ${LOG_PATH} 
 
 printf "👷 Starting filebrowser in background... \n\n"
 
-
 printf "📂 Serving $${ROOT_DIR} at http://localhost:${PORT} \n\n"
 
-printf "Running 'filebrowser %s' \n\n" "$DB_FLAG"
-
-filebrowser $DB_FLAG >> ${LOG_PATH} 2>&1 &
+filebrowser >> ${LOG_PATH} 2>&1 &
 
 printf "📝 Logs at ${LOG_PATH} \n\n"