modified acestream service and app data directory

5 files changed, 31 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e6d8147e6ae..258cf938c818 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 = 3
+	pkgrel = 4
 	url = http://acestream.org/
 	install = acestream-engine.install
 	arch = x86_64
@@ -14,13 +14,13 @@ pkgbase = acestream-engine-stable
 	provides = acestream-engine
 	conflicts = acestream-engine
 	backup = usr/lib/acestream-engine/acestream.conf
-	source = acestream-engine.service
 	source = acestream-engine-stable-3.1.49.tar.gz::http://acestream.org/downloads/linux/acestream_3.1.49_ubuntu_18.04_x86_64.tar.gz
+	source = acestream-engine.service
 	source = acestream-engine.desktop
 	source = LICENSE
-	sha256sums = 9446e4c36c2e92b4253a1c3fea5fa30d366d46295dcd1f1cac4ddfe8f002fcbe
 	sha256sums = d2ed7bdc38f6a47c05da730f7f6f600d48385a7455d922a2688f7112202ee19e
-	sha256sums = fad731aec3371b3e76065cf1668be6b61d33547d321c8cfb2b6018faa3d5b7b0
+	sha256sums = eac3ba7e0aea10deae99d9d494de424c3ccbcc0efb11618e7490e084c05f5412
+	sha256sums = e5e0ff385cecfe9af381f870836295b48d466cb675f36b658c80a978a3006d87
 	sha256sums = SKIP
 
 pkgname = acestream-engine-stable
diff --git a/PKGBUILD b/PKGBUILD
index a67fbd64b922..a2791efbbf6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ _enginename=acestreamengine
 
 pkgname=acestream-engine-stable
 pkgver=3.1.49
-pkgrel=3
+pkgrel=4
 pkgdesc="P2P utility for multimedia live streaming and file transfer (stable version)"
 arch=("x86_64")
 url="http://acestream.org/"
@@ -30,14 +30,14 @@ conflicts=("$_pkgbasename")
 backup=("usr/lib/$_pkgbasename/acestream.conf")
 install="$_pkgbasename.install"
 source=(
-    "$_pkgbasename.service"
     "$pkgname-$pkgver.tar.gz::http://acestream.org/downloads/linux/acestream_${pkgver}_ubuntu_${_ubuntuver}_x86_64.tar.gz"
+    "$_pkgbasename.service"
     "$_pkgbasename.desktop"
     "LICENSE")
 sha256sums=(
-    "9446e4c36c2e92b4253a1c3fea5fa30d366d46295dcd1f1cac4ddfe8f002fcbe"
     "d2ed7bdc38f6a47c05da730f7f6f600d48385a7455d922a2688f7112202ee19e"
-    "fad731aec3371b3e76065cf1668be6b61d33547d321c8cfb2b6018faa3d5b7b0"
+    "eac3ba7e0aea10deae99d9d494de424c3ccbcc0efb11618e7490e084c05f5412"
+    "e5e0ff385cecfe9af381f870836295b48d466cb675f36b658c80a978a3006d87"
     "SKIP")
 
 package() {
diff --git a/acestream-engine.desktop b/acestream-engine.desktop
index 71d8492a686c..229794678521 100644
--- a/acestream-engine.desktop
+++ b/acestream-engine.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Name=Ace Stream Engine
 GenericName=P2P streaming application
 Comment=Watch live streaming content over Ace Stream platform
-Exec=acestreamengine --client-gtk --log-file $HOME/.ACEStream/acestream.log
+Exec=acestreamengine --client-gtk --state-dir $HOME/.local/share/ACEStream --log-file $HOME/.local/share/ACEStream/acestreamengine.log
 Icon=acestream-engine
 Categories=Network;FileTransfer;P2P;
 StartupNotify=true
diff --git a/acestream-engine.install b/acestream-engine.install
index 346bb827b404..41650564e453 100644
--- a/acestream-engine.install
+++ b/acestream-engine.install
@@ -1,16 +1,29 @@
+#_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() {
-  if ! getent passwd acestream &> /dev/null; then
-    useradd -u 4035 -g video -m -s /usr/bin/nologin acestream
-  fi
+    _remove_acestream_user
 }
 
 post_upgrade() {
-  post_install
+    _remove_acestream_user
 }
 
 post_remove() {
-  if getent passwd acestream &>/dev/null; then
-    userdel acestream
-  fi
+    _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
 }
  
diff --git a/acestream-engine.service b/acestream-engine.service
index 3c8a1e280e74..79316d2264ea 100644
--- a/acestream-engine.service
+++ b/acestream-engine.service
@@ -1,12 +1,9 @@
 [Unit]
-Description=AceStream Engine (console)
+Description=AceStream Engine Service
 After=network.target
 
 [Service]
-Type=simple
-User=acestream
-Group=video
-ExecStart=/usr/bin/acestreamengine --client-console --bind-all
+ExecStart=/usr/bin/acestreamengine --client-console --live-cache-type memory --state-dir /usr/share/ACEStream --log-file /usr/share/ACEStream/acestreamengine.log
 
 [Install]
 WantedBy=multi-user.target