diff --git a/Dockerfile b/Dockerfile index fc5e660b..be669828 100644 --- a/Dockerfile +++ b/Dockerfile @@ -106,7 +106,7 @@ ARG UNAME=scanservjs # config files need write access). RUN groupadd -g $GID -o $UNAME \ && useradd -o -u $UID -g $GID -m -s /bin/bash $UNAME \ - && chown -R $UID:$GID /entrypoint.sh /usr/share/scanservjs /etc/sane.d/net.conf /etc/sane.d/airscan.conf + && chown -R $UID:$GID /entrypoint.sh /var/lib/scanservjs /etc/sane.d/net.conf /etc/sane.d/airscan.conf USER $UNAME # default build diff --git a/app-server/package.json b/app-server/package.json index f91657ad..a50e3fcb 100644 --- a/app-server/package.json +++ b/app-server/package.json @@ -1,6 +1,6 @@ { "name": "scanservjs-server", - "version": "3.0.2", + "version": "3.0.3", "description": "scanservjs-api is a REST based API to control your scanner.", "scripts": { "build": "node build.js", diff --git a/app-ui/package.json b/app-ui/package.json index 718b5462..0d03a947 100644 --- a/app-ui/package.json +++ b/app-ui/package.json @@ -1,6 +1,6 @@ { "name": "scanservjs-ui", - "version": "3.0.2", + "version": "3.0.3", "description": "scanservjs is a simple web-based UI for SANE which allows you to share a scanner on a network without the need for drivers or complicated installation.", "author": "Sam Strachan", "scripts": { diff --git a/docs/02-docker.md b/docs/02-docker.md index df90c368..6003a1f0 100644 --- a/docs/02-docker.md +++ b/docs/02-docker.md @@ -217,7 +217,7 @@ To access data from outside the docker container, there are two volumes you may wish to map: * The scanned images: use - `--volume /local/path/scans:/usr/share/scanservjs/output` + `--volume /local/path/scans:/var/lib/scanservjs/output` * Configuration overrides: use `--volume /local/path/cfg:/etc/scanservjs` ## User and group mapping @@ -323,7 +323,7 @@ docker run --detach --publish 8080:8080 \ ```sh docker run --detach --publish 8080:8080 \ - --volume $HOME/scan-data:/usr/share/scanservjs/output \ + --volume $HOME/scan-data:/var/lib/scanservjs/output \ --volume $HOME/scan-cfg:/etc/scanservjs \ --device /dev/bus/usb/001/003:/dev/bus/usb/001/003 \ --name scanservjs-container sbs20/scanservjs:latest diff --git a/docs/04-troubleshooting.md b/docs/04-troubleshooting.md index 2dba022f..295640d5 100644 --- a/docs/04-troubleshooting.md +++ b/docs/04-troubleshooting.md @@ -49,7 +49,7 @@ sudo su --shell /bin/bash - scanservjs --command 'scanimage --format tiff > test ``` which should output a tif file in the scanservjs home directory -(`/usr/share/scanservjs/`). If you can get this to work then scanservjs should +(`/var/lib/scanservjs/`). If you can get this to work then scanservjs should be working fine. ## Permissions; `scanimage` works with `sudo` but not without diff --git a/makedeb.sh b/makedeb.sh index e1db2996..517bc19f 100755 --- a/makedeb.sh +++ b/makedeb.sh @@ -5,7 +5,7 @@ BASE="./debian" APP_NAME="scanservjs" PATH_ETC="/etc/$APP_NAME" PATH_SYSTEMD="/lib/systemd/system" -PATH_RUNTIME="/usr/share/$APP_NAME" +PATH_RUNTIME="/var/lib/$APP_NAME" PATH_LIB="/usr/lib/$APP_NAME" PATH_DOC="/usr/share/doc/$APP_NAME" DIR_DEBIAN="$BASE/DEBIAN" diff --git a/package-lock.json b/package-lock.json index 3a2b1abb..4561e774 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "scanservjs", - "version": "3.0.2", + "version": "3.0.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "scanservjs", - "version": "3.0.2", + "version": "3.0.3", "license": "GPL-2.0", "workspaces": [ "app-server", @@ -19,7 +19,7 @@ }, "app-server": { "name": "scanservjs-server", - "version": "3.0.2", + "version": "3.0.3", "license": "GPL-2.0", "dependencies": { "adm-zip": "0.5.10", @@ -42,7 +42,7 @@ }, "app-ui": { "name": "scanservjs-ui", - "version": "3.0.2", + "version": "3.0.3", "license": "GPL-2.0", "dependencies": { "@intlify/unplugin-vue-i18n": "1.5.0", diff --git a/package.json b/package.json index 90634def..0f037fe8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scanservjs", - "version": "3.0.2", + "version": "3.0.3", "description": "scanservjs is a simple web-based UI for SANE which allows you to share a scanner on a network without the need for drivers or complicated installation.", "scripts": { "build:version": "npm --allow-same-version --no-git-tag-version version $npm_package_version --workspaces",