create user with systemd

1 files changed, 30 insertions, 28 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a9b45646d9a9..e031900630ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,8 @@
-# Maintainer: skydrome <skydrome@i2pmail.org>
-# Contributor: skydrome <skydrome@i2pmail.org>
+# Contributor: skydrome <skydrome@protonmail.com>
+# Maintainer:  skydrome <skydrome@protonmail.com>
 
-########[ OPTIONS ]########################################
-#
 # Uncomment if you do not want to build all language translations
 #export LG2=en
-#
-###########################################################
 
 pkgname=i2p
 pkgver=0.9.38
@@ -16,12 +12,13 @@ url="https://geti2p.net"
 license=('GPL2')
 arch=('any')
 depends=('java-runtime>=7' 'java-service-wrapper')
-makedepends=('apache-ant' 'java-environment>=7')
+makedepends=('java-environment>=7' 'apache-ant')
 [[ "$LG2" != 'en' ]] && makedepends+=('gettext')
 #optdepends=('gtk2: for rrd graphs')
 conflicts=('i2p-bin' 'i2p-dev')
 backup=('opt/i2p/wrapper.config')
 install='i2p.install'
+options=(!strip)
 
 #_url="https://download.i2p2.de/releases/${pkgver}"
 _url="https://launchpad.net/i2p/trunk/${pkgver}/+download"
@@ -40,39 +37,44 @@ sha256sums=('65fe327fdd11272a764c9e1c6ae1f38b151cea9003216b861c7ff2b281ca2970'
 validpgpkeys=('2D3D2D03910C6504C1210C65EE60C0C8EE7256A8')
 
 build() {
-    cd "$srcdir/$pkgname-$pkgver"
+    cd "$pkgname-$pkgver"
 
-    export ANT_HOME=/usr/share/ant
+    source /etc/ant.conf
     export ANT_OPTS="-Dfile.encoding=UTF-8"
-
     ant preppkg-linux-only
 }
 
 package() {
-    cd "$srcdir/$pkgname-$pkgver"
+    cd "$pkgdir"
+
+    install -dm755 "usr/bin"
+    install -dm755 "opt/i2p"
 
-    install -dm755 "$pkgdir/usr/lib/tmpfiles.d"
-    install -dm755 "$pkgdir/usr/bin"
-    install -dm750 "$pkgdir/opt/i2p"
+    cp -r "$srcdir/$pkgname-$pkgver"/pkg-temp/* "opt/i2p"
 
-    cp -r pkg-temp/* "$pkgdir/opt/i2p"
-    cp "$srcdir/wrapper.config" "$pkgdir/opt/i2p"
+    install -Dm644 "$srcdir/router.config"     "opt/i2p/router.config"
+    install -Dm644 "$srcdir/wrapper.config"    "opt/i2p/wrapper.config"
+    install -Dm755 "$srcdir/i2prouter.sh"      "opt/i2p/i2prouter"
+    install -Dm644 "$srcdir/i2prouter.service" "usr/lib/systemd/system/i2prouter.service"
+    install -Dm644 "opt/i2p/man/eepget.1"      "usr/share/man/man1/eepget.1"
+    install -Dm644 "opt/i2p/LICENSE.txt"       "usr/share/licenses/i2p/LICENSE"
+    mv opt/i2p/licenses/*                      "usr/share/licenses/i2p/"
 
-    install -Dm644 "$srcdir/router.config"        "$pkgdir/opt/i2p/router.config"
-    install -Dm755 "$srcdir/i2prouter.sh"         "$pkgdir/opt/i2p/i2prouter"
-    install -Dm644 "$srcdir/i2prouter.service"    "$pkgdir/usr/lib/systemd/system/i2prouter.service"
-    install -Dm644 "$pkgdir/opt/i2p/man/eepget.1" "$pkgdir/usr/share/man/man1/eepget.1"
-    install -Dm644 "$pkgdir/opt/i2p/LICENSE.txt"  "$pkgdir/usr/share/licenses/i2p/LICENSE"
-    mv "$pkgdir"/opt/i2p/licenses/*               "$pkgdir/usr/share/licenses/i2p/"
+    ln -s /opt/i2p/{eepget,i2prouter} "usr/bin/"
+    chmod +x opt/i2p/{eepget,i2prouter}
 
-    ln -s /opt/i2p/{eepget,i2prouter} "$pkgdir/usr/bin/"
-    chmod +x "$pkgdir"/opt/i2p/{eepget,i2prouter}
+    chmod  -x opt/i2p/*.config
+    chmod 755 opt/i2p
+    chown  -R 985:985 opt/i2p
 
-    echo 'd /run/i2p 0700 i2p i2p -'    >"$pkgdir/usr/lib/tmpfiles.d/i2prouter.conf"
+    echo 'u i2p 985 "I2P Router" /opt/i2p /bin/sh' |
+    install -Dm644 /dev/stdin "usr/lib/sysusers.d/i2p.conf"
+    echo 'd /run/i2p 0700 i2p i2p' |
+    install -Dm644 /dev/stdin "usr/lib/tmpfiles.d/i2p.conf"
 
-    sed -i "$pkgdir"/opt/i2p/eepget \
+    sed -i opt/i2p/eepget \
         -e 's:%INSTALL_PATH:/opt/i2p:g'
-    sed -i "$pkgdir"/opt/i2p/clients.config \
+    sed -i opt/i2p/clients.config \
         -e "s:clientApp.4.startOnLoad=.*:clientApp.4.startOnLoad=false:"
-    rm -r "$pkgdir"/opt/i2p/{osid,postinstall.sh,runplain.sh,INSTALL-headless.txt,LICENSE.txt,licenses,man,lib/wrapper*}
+    rm -r opt/i2p/{osid,postinstall.sh,runplain.sh,INSTALL-headless.txt,LICENSE.txt,licenses,man,lib/wrapper*}
 }