summaryrefslogtreecommitdiff
path: root/user/sane
diff options
context:
space:
mode:
Diffstat (limited to 'user/sane')
-rw-r--r--user/sane/APKBUILD6
-rw-r--r--user/sane/sane.pre-install2
-rw-r--r--user/sane/saned.pre-install3
3 files changed, 6 insertions, 5 deletions
diff --git a/user/sane/APKBUILD b/user/sane/APKBUILD
index 941402502..42b4984c7 100644
--- a/user/sane/APKBUILD
+++ b/user/sane/APKBUILD
@@ -4,7 +4,7 @@
pkgname=sane
_pkgname=sane-backends
pkgver=1.0.27
-pkgrel=5
+pkgrel=6
pkgdesc="Scanner access library"
url="http://www.sane-project.org/"
arch="all"
@@ -66,7 +66,7 @@ check() {
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
- echo -n "" > "$pkgdir"/etc/sane.d/dll.conf
+ printf "" > "$pkgdir"/etc/sane.d/dll.conf
install -Dm644 backend/dll.aliases "$pkgdir"/etc/sane.d/dll.aliases
}
@@ -117,7 +117,7 @@ backends() {
}
_backend() {
- local name=${subpkgname#$pkgname-backend-}
+ local name="${subpkgname#$pkgname-backend-}"
depends="$pkgname"
pkgdesc=$(eval echo \$_pkgdesc_$name)
if [ ! "$pkgdesc" ]; then
diff --git a/user/sane/sane.pre-install b/user/sane/sane.pre-install
index b75c867de..9b89cab57 100644
--- a/user/sane/sane.pre-install
+++ b/user/sane/sane.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup -S scanner 2>/dev/null
+groupadd -r scanner 2>/dev/null
exit 0
diff --git a/user/sane/saned.pre-install b/user/sane/saned.pre-install
index caad990d9..79ca791dd 100644
--- a/user/sane/saned.pre-install
+++ b/user/sane/saned.pre-install
@@ -1,5 +1,6 @@
#!/bin/sh
-adduser -SDH -h /run/saned -s /sbin/nologin -G scanner -g saned saned 2>/dev/null
+useradd -c saned -s /sbin/nologin -g scanner \
+ -m -d /run/saned -r saned 2>/dev/null
exit 0