hrfee/jfa-go
1
0
Fork 0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-12-31 13:30:11 +00:00
Code Issues Projects Releases Wiki Activity

trim '/' from path when using systemFS

Browse Source 
should fix #58.
This commit is contained in:
Harvey Tindall 2021-02-17 22:02:26 +00:00
parent a92baa5d18
commit cdc837e781
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
View File

@ -71,7 +71,7 @@ steps:
- ./goreleaser.sh --snapshot --skip-publish --rm-dist - ./goreleaser.sh --snapshot --skip-publish --rm-dist
- wget https://builds.hrfee.pw/upload.py - wget https://builds.hrfee.pw/upload.py
- pip3 install requests - pip3 install requests
- bash -c 'python3 upload.py https://builds.hrfee.dev hrfee jfa-go ./dist/*.tar.gz' - bash -c 'python3 upload.py https://builds.hrfee.pw hrfee jfa-go ./dist/*.tar.gz'
environment: environment:
BUILDRONE_KEY: BUILDRONE_KEY:
from_secret: BUILDRONE_KEY from_secret: BUILDRONE_KEY

2
Dockerfile
View File

@ -7,7 +7,7 @@ RUN apt update -y \
&& (curl -sL https://deb.nodesource.com/setup_14.x | bash -) \ && (curl -sL https://deb.nodesource.com/setup_14.x | bash -) \
&& apt install nodejs \ && apt install nodejs \
&& (cd /opt/build; make configuration npm email version typescript bundle-css swagger copy external-files GOESBUILD=on) \ && (cd /opt/build; make configuration npm email version typescript bundle-css swagger copy external-files GOESBUILD=on) \
&& sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/data/html/setup.html && sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/build/data/html/setup.html
FROM --platform=$BUILDPLATFORM golang:latest AS build FROM --platform=$BUILDPLATFORM golang:latest AS build

2
config.go
View File

@ -17,7 +17,7 @@ func (app *appContext) GetPath(sect, key string) (fs.FS, string) {
if strings.HasPrefix(val, "jfa-go:") { if strings.HasPrefix(val, "jfa-go:") {
return localFS, strings.TrimPrefix(val, "jfa-go:") return localFS, strings.TrimPrefix(val, "jfa-go:")
} }
return app.systemFS, val return app.systemFS, strings.TrimPrefix(val, "/")
} }
func (app *appContext) loadConfig() error { func (app *appContext) loadConfig() error {