trim '/' from path when using systemFS

should fix #58.
hrfee · Feb 17, 2021 · cdc837e · cdc837e
1 parent a92baa5
commit cdc837e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -71,7 +71,7 @@ steps:
         - ./goreleaser.sh --snapshot --skip-publish --rm-dist
         - wget https://builds.hrfee.pw/upload.py
         - 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:
           BUILDRONE_KEY:
               from_secret: BUILDRONE_KEY

diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,7 @@ RUN apt update -y \
     && (curl -sL https://deb.nodesource.com/setup_14.x | bash -) \
     && apt install nodejs \
     && (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

diff --git a/config.go b/config.go
@@ -17,7 +17,7 @@ func (app *appContext) GetPath(sect, key string) (fs.FS, string) {
 	if strings.HasPrefix(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 {