8000 fix(filebrowser): configure before running by evilhamsterman · Pull Request #400 · coder/modules · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on May 15, 2025. It is now read-only.

fix(filebrowser): configure before running #400

Merged
merged 8 commits into from
Mar 21, 2025
Merged

fix(filebrowser): configure before running #400

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2c30497
Fix filebrowser config
evilhamsterman Feb 8, 2025
462a79f
Append log
evilhamsterman Feb 8, 2025
fb156fa
Update config line
evilhamsterman Feb 8, 2025
36dc852
Allow changing config on each run
evilhamsterman Feb 8, 2025
4d7af0c
Apply suggestions
evilhamsterman Mar 7, 2025
9acc25c
Switch to double square brackets
evilhamsterman Mar 7, 2025
36450ff
Use FB_DATABASE instead of DB_FLAG
evilhamsterman Mar 7, 2025
bf86489
Merge branch 'main' into main
matifali Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply suggestions
  • Loading branch information
@evilhamsterman
evilhamsterman committed Mar 7, 2025
commit 4d7af0cf23410208dea8a367c7a425efdebbadf2
8 changes: 4 additions & 4 deletions filebrowser/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 &
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to make it clear that this issue was not introduced by this PR.

But I'll just mention this again; this will break if DB_PATH has spaces in it. A better way would be to initialize this as an array and use it in a way that handles spaces:

args=()
if [ "${DB_PATH}" != "filebrowser.db" ]; then
	args+=(-d "${DB_PATH}")
fi

Then use this as:

filebrowser "${args[@]}"

(I did not verify if $$ vs $ is required here due to terraform templates.)

This syntax works even in bash-3.2, so should be fine to use. (I opted for arrays as I see we already have a heavy dependency on Bash here.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBH There's a lot of places that it could break because of spaces in the path, the LOG_PATH and SERVER_BASE_PATH could also cause problems.

I do think I found a bit easier and more readable way to handle it. Filebrowser supports the FB_DATABASE environment variable. So I just set that at the top inside quotes and then it doesn't matter, it works with or without spaces.


Expand Down
0