ace service optimized and set folders following guidelines

5 files changed, 28 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 258cf938c818..0517dc42884a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = acestream-engine-stable
 	pkgdesc = P2P utility for multimedia live streaming and file transfer (stable version)
 	pkgver = 3.1.49
-	pkgrel = 4
+	pkgrel = 5
 	url = http://acestream.org/
 	install = acestream-engine.install
 	arch = x86_64
@@ -19,8 +19,8 @@ pkgbase = acestream-engine-stable
 	source = acestream-engine.desktop
 	source = LICENSE
 	sha256sums = d2ed7bdc38f6a47c05da730f7f6f600d48385a7455d922a2688f7112202ee19e
-	sha256sums = eac3ba7e0aea10deae99d9d494de424c3ccbcc0efb11618e7490e084c05f5412
-	sha256sums = e5e0ff385cecfe9af381f870836295b48d466cb675f36b658c80a978a3006d87
+	sha256sums = a0b657b00e8cedc69d24d28591c478d5b4c3443ed1a2796f3c606ae6635cbd89
+	sha256sums = 930ba23b7d94487d51c2b43203922467ae254981d00992337ab9a057c5e0f804
 	sha256sums = SKIP
 
 pkgname = acestream-engine-stable
diff --git a/PKGBUILD b/PKGBUILD
index a2791efbbf6d..fdde0d17e27a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ _enginename=acestreamengine
 
 pkgname=acestream-engine-stable
 pkgver=3.1.49
-pkgrel=4
+pkgrel=5
 pkgdesc="P2P utility for multimedia live streaming and file transfer (stable version)"
 arch=("x86_64")
 url="http://acestream.org/"
@@ -36,8 +36,8 @@ source=(
     "LICENSE")
 sha256sums=(
     "d2ed7bdc38f6a47c05da730f7f6f600d48385a7455d922a2688f7112202ee19e"
-    "eac3ba7e0aea10deae99d9d494de424c3ccbcc0efb11618e7490e084c05f5412"
-    "e5e0ff385cecfe9af381f870836295b48d466cb675f36b658c80a978a3006d87"
+    "a0b657b00e8cedc69d24d28591c478d5b4c3443ed1a2796f3c606ae6635cbd89"
+    "930ba23b7d94487d51c2b43203922467ae254981d00992337ab9a057c5e0f804"
     "SKIP")
 
 package() {
@@ -56,4 +56,15 @@ package() {
 
     mkdir -p "$pkgdir/usr/bin"
     ln -sf "/usr/lib/$_pkgbasename/start-engine" "$pkgdir/usr/bin/$_enginename"
+    ln -sf "/usr/lib/$_pkgbasename/start-engine" "$pkgdir/usr/bin/$_pkgbasename"
+    
+    # acestream user
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$_pkgbasename.conf" <<END
+u acestream - "systemd Ace Stream Service"
+END
+
+    # acestream service directory
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$_pkgbasename.conf" <<END
+d /var/lib/ACEStream 0755 acestream acestream -
+END
 }
diff --git a/acestream-engine.desktop b/acestream-engine.desktop
index 229794678521..1a01ab6ac9e5 100644
--- a/acestream-engine.desktop
+++ b/acestream-engine.desktop
@@ -3,11 +3,9 @@ Version=1.0
 Name=Ace Stream Engine
 GenericName=P2P streaming application
 Comment=Watch live streaming content over Ace Stream platform
-Exec=acestreamengine --client-gtk --state-dir $HOME/.local/share/ACEStream --log-file $HOME/.local/share/ACEStream/acestreamengine.log
+Exec=acestream-engine --client-gtk --state-dir $HOME/.config/ACEStream --log-file $HOME/.config/ACEStream/acestream-engine.log
 Icon=acestream-engine
 Categories=Network;FileTransfer;P2P;
 StartupNotify=true
 Terminal=false
 Type=Application
-
-
diff --git a/acestream-engine.install b/acestream-engine.install
index 41650564e453..c69be64cb95c 100644
--- a/acestream-engine.install
+++ b/acestream-engine.install
@@ -1,29 +1,19 @@
-#_create_acestream_user() {
-#   if ! getent passwd acestream &> /dev/null; then
-#       useradd -u 4035 -g video -M -s /usr/bin/nologin acestream
-#   fi
-#}
-
-_remove_acestream_user() {
-    if getent passwd acestream &>/dev/null; then
-        userdel acestream
-    fi
-}
-
 post_install() {
-    _remove_acestream_user
+    echo
+    echo ">>> To start acestream-engine as systemd service, first reboot the system"
+    echo
 }
 
 post_upgrade() {
-    _remove_acestream_user
+    echo
+    echo ">>> To start acestream-engine as systemd service, first reboot the system"
+    echo
 }
 
 post_remove() {
-    _remove_acestream_user
-
     echo
-    echo ">>> remove files under /usr/share/ACEStream if you"
-    echo ">>> don't need to reinstall the package in the future"
+    echo ">>> remove files under /var/lib/ACEStream and ~/.config/ACEStream"
+    echo ">>> if you don't need to reinstall the package in the future"
     echo
 }
  
diff --git a/acestream-engine.service b/acestream-engine.service
index 79316d2264ea..e5f05e4e33c0 100644
--- a/acestream-engine.service
+++ b/acestream-engine.service
@@ -3,7 +3,8 @@ Description=AceStream Engine Service
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/acestreamengine --client-console --live-cache-type memory --state-dir /usr/share/ACEStream --log-file /usr/share/ACEStream/acestreamengine.log
+User=acestream
+ExecStart=env PYTHON_EGG_CACHE=/var/lib/ACEStream/Python-Eggs /usr/bin/acestream-engine --client-console @/usr/lib/acestream-engine/acestream.conf --live-cache-type memory --state-dir /var/lib/ACEStream --log-file /var/lib/ACEStream/acestream-engine.log
 
 [Install]
 WantedBy=multi-user.target