diff options
| -rw-r--r-- | testing/domoticz/APKBUILD | 7 | ||||
| -rw-r--r-- | testing/domoticz/domoticz.confd | 2 | ||||
| -rw-r--r-- | testing/domoticz/domoticz.pre-install | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/testing/domoticz/APKBUILD b/testing/domoticz/APKBUILD index 39c097525c..ff49fa9183 100644 --- a/testing/domoticz/APKBUILD +++ b/testing/domoticz/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=domoticz pkgver=20160207 -pkgrel=2 +pkgrel=3 pkgdesc="Open source Home Automation System" url="http://www.domoticz.com/" arch="all" @@ -53,9 +53,12 @@ build() { package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 - mkdir -p "$pkgdir"/usr/bin + mkdir -p "$pkgdir"/usr/bin \ + "$pkgdir"/usr/share/$pkgname || return 1 mv "$pkgdir"/var/lib/domoticz/domoticz \ "$pkgdir"/usr/bin/ || return 1 + mv "$pkgdir"/var/lib/domoticz/www \ + "$pkgdir"/usr/share/$pkgname/ || return 1 rm -f "$pkgdir"/var/lib/domoticz/updatedomo chown -R $pkgname "$pkgdir"/var/lib/domoticz || return 1 install -D -m755 "$srcdir"/$pkgname.initd \ diff --git a/testing/domoticz/domoticz.confd b/testing/domoticz/domoticz.confd index ab3c49757a..31ee17f1ef 100644 --- a/testing/domoticz/domoticz.confd +++ b/testing/domoticz/domoticz.confd @@ -2,6 +2,6 @@ user="domoticz" dbase="/var/lib/domoticz/domoticz.db" userdata="/var/lib/domoticz/" -wwwroot="/var/lib/domoticz/www/" +wwwroot="/usr/share/domoticz/www/" pidfile="/var/run/domoticz/domoticz.pid" daemon_args="" diff --git a/testing/domoticz/domoticz.pre-install b/testing/domoticz/domoticz.pre-install index 78026bfedb..a94a5fb50b 100644 --- a/testing/domoticz/domoticz.pre-install +++ b/testing/domoticz/domoticz.pre-install @@ -1,4 +1,3 @@ #!/bin/sh -adduser -H -D -s /sbin/nologin domoticz 2>/dev/null -adduser domoticz usb 2>/dev/null +adduser -h /var/lib/domoticz -D -s /sbin/nologin domoticz 2>/dev/null exit 0 |