update to upstream 0.92 and simplify installation

5 files changed, 48 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b418f22f7e54..a22d1213aa4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,27 @@
 pkgbase = repetier-server
-        pkgdesc = repetier server component
-        pkgver = 0.90.2
-        pkgrel = 4
-        url = https://www.repetier-server.com/
-        arch = i686
-        arch = x86_64
-        arch = armv7h
-        license = custom
-        depends = systemd
-        provides = repetier-server
-        conflicts = repetier-host
-        source = RepetierServer.xml
-        source = RepetierServer.service
-        sha256sums = 451696abaee63d161fa20fee61a7a8d779f09873cdaf2e25a300309760313945
-        sha256sums = c187ca73e8fc397625ddec0549478ac1921abc868d56156a032b39ca208b2be3
-        source_i686 = http://download.repetier.com/files/server/debian-intel32/Repetier-Server-0.90.2-Linux.deb
-        sha256sums_i686 = 25b3824f7bcfe173d340b87d9dcf007c60b8fff6012268aef236d80cb671ef66
-        source_x86_64 = http://download.repetier.com/files/server/debian-amd64/Repetier-Server-0.90.2-Linux.deb
-        sha256sums_x86_64 = 60b9ed58bc8d788072c168b4c45a73738415178a6816c179e1c0e9101b684afd
-        source_armv7h = http://download.repetier.com/files/server/debian-armhf/Repetier-Server-0.90.2-Linux.deb
-        sha256sums_armv7h = e65704a274cb0eb06e327d3a21781fe20320f7f42f1bd8610cbc0adad22870f6
+	pkgdesc = repetier server component
+	pkgver = 0.92.0
+	pkgrel = 1
+	url = https://www.repetier-server.com/
+	install = repetier-server.install
+	arch = i686
+	arch = x86_64
+	arch = armv7h
+	arch = aarch64
+	license = custom
+	makedepends = binutils
+	makedepends = fakeroot
+	depends = systemd
+	provides = repetier-server
+	conflicts = repetier-host
+	source_i686 = http://download.repetier.com/files/server/debian-intel32/Repetier-Server-0.92.0-Linux.deb
+	sha256sums_i686 = 4fa641835cb1663f0ec5fef70419bf0bdd15859fcc5cb4699e0060a584ce608e
+	source_x86_64 = http://download.repetier.com/files/server/debian-amd64/Repetier-Server-0.92.0-Linux.deb
+	sha256sums_x86_64 = 2228aed451066985accb88e911fa35cad4cdc940b630e1880937efaf75e5c08c
+	source_armv7h = http://download.repetier.com/files/server/debian-armhf/Repetier-Server-0.92.0-Linux.deb
+	sha256sums_armv7h = 3e7adc61794c8986ad85e568a943530700d2a8d99f4657bd0289cd457f4df8d6
+	source_aarch64 = http://download.repetier.com/files/server/debian-arm64hf/Repetier-Server-0.92.0-Linux.deb
+	sha256sums_aarch64 = fb173a5cba75e2f4c1988b77c70ccb8df1662b31092ab6bc816ccde09df408a8
 
 pkgname = repetier-server
 
diff --git a/PKGBUILD b/PKGBUILD
index 584f05aa76fe..03267eecf56a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,34 @@
 # Maintainer: Lukas Wingerberg <h@xx0r.eu>
 
 pkgname=repetier-server
-pkgver=0.90.2
-pkgrel=4
+pkgver=0.92.0
+pkgrel=1
 pkgdesc='repetier server component'
-arch=('i686' 'x86_64' 'armv7h')
+arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 url='https://www.repetier-server.com/'
 license=('custom')
-depends=('systemd')
+depends=('systemd' 'avahi')
+makedepends=('binutils' 'fakeroot')
 provides=('repetier-server')
 conflicts=('repetier-host')
 install=${pkgname}.install
-source=('RepetierServer.xml'
-        'RepetierServer.service')
 source_i686=("http://download.repetier.com/files/server/debian-intel32/Repetier-Server-${pkgver}-Linux.deb")
 source_x86_64=("http://download.repetier.com/files/server/debian-amd64/Repetier-Server-${pkgver}-Linux.deb")
 source_armv7h=("http://download.repetier.com/files/server/debian-armhf/Repetier-Server-${pkgver}-Linux.deb")
-sha256sums=('451696abaee63d161fa20fee61a7a8d779f09873cdaf2e25a300309760313945'
-            'c187ca73e8fc397625ddec0549478ac1921abc868d56156a032b39ca208b2be3')
-sha256sums_i686=('25b3824f7bcfe173d340b87d9dcf007c60b8fff6012268aef236d80cb671ef66')
-sha256sums_x86_64=('60b9ed58bc8d788072c168b4c45a73738415178a6816c179e1c0e9101b684afd')
-sha256sums_armv7h=('e65704a274cb0eb06e327d3a21781fe20320f7f42f1bd8610cbc0adad22870f6')
+source_aarch64=("http://download.repetier.com/files/server/debian-arm64hf/Repetier-Server-${pkgver}-Linux.deb")
+sha256sums_i686=('4fa641835cb1663f0ec5fef70419bf0bdd15859fcc5cb4699e0060a584ce608e')
+sha256sums_x86_64=('2228aed451066985accb88e911fa35cad4cdc940b630e1880937efaf75e5c08c')
+sha256sums_armv7h=('3e7adc61794c8986ad85e568a943530700d2a8d99f4657bd0289cd457f4df8d6')
+sha256sums_aarch64=('fb173a5cba75e2f4c1988b77c70ccb8df1662b31092ab6bc816ccde09df408a8')
 
 package() {
   cd ${srcdir}
   bsdtar -xf data.tar.gz -C "$pkgdir"
   install -dm 755 "${pkgdir}"/usr/local/Repetier-Server
-  mkdir "${pkgdir}"/opt/RepetierServer -p
-  mkdir "${pkgdir}"/usr/lib/systemd/system/ -p
-  mv "${pkgdir}"/usr/local/Repetier-Server/{bin,debian,etc,firmware,languages,modules,www} "${pkgdir}"/opt/RepetierServer
-  rm -r "${pkgdir}"/etc/ "${pkgdir}"/lib/ "${pkgdir}"/usr/local/
-  install -m 644 RepetierServer.service "${pkgdir}"/usr/lib/systemd/system/
-  install -m 644 RepetierServer.xml "${pkgdir}"/opt/RepetierServer/etc/
+  install -dm 755 "${pkgdir}"/lib
+  mkdir -p "${pkgdir}"/opt/RepetierServer
+  mv "${pkgdir}"/usr/local/Repetier-Server/{bin,debian,extra,etc,firmware,licenses,languages,modules,www} "${pkgdir}"/opt/RepetierServer
+  mv "${pkgdir}"/lib/systemd/system/RepetierServer.service "${pkgdir}"/opt/RepetierServer
+  rm -r "${pkgdir}"/etc/ "${pkgdir}"/lib/ "${pkgdir}"/usr/
 }
 
diff --git a/RepetierServer.service b/RepetierServer.service
deleted file mode 100644
index bb6a6499e728..000000000000
--- a/RepetierServer.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=Repetier-Server 3D Printer Server
-After=network.target
-
-[Service]
-Type=forking
-PermissionsStartOnly=true
-LimitNICE=-20
-Nice=-20
-KillMode=process
-User=repetierserver
-ExecStartPre=/bin/mkdir -p /opt/RepetierServer/data/
-ExecStartPre=/bin/chown -R repetierserver /opt/RepetierServer/data
-ExecStart=/opt/RepetierServer/bin/RepetierServer -c /opt/RepetierServer/etc/RepetierServer.xml --daemon
-Restart=on-failure
-RestartSec=0
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/RepetierServer.xml b/RepetierServer.xml
deleted file mode 100644
index 5a39ad1f9282..000000000000
--- a/RepetierServer.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<server>
-    <installation-directory>/opt/RepetierServer/</installation-directory>
-    <storage-directory>/opt/RepetierServer/data/</storage-directory>
-    <default-language>en</default-language>
-    <port>3344</port>
-    <disableIPV6>true</disableIPV6><!-- setting to false can cause problems with external access -->
-    <logging>true</logging>
-    <backlog-size>1000</backlog-size>
-    <update-info-url>http://download.repetier-server.com/files/server/debian-armhf/updateinfo.txt</update-info-url>
-    <printer-frontend-url>/modules/front2/www/app.html</printer-frontend-url>
-    <web-frontend-url>/</web-frontend-url>
-</server>
-
diff --git a/repetier-server.install b/repetier-server.install
index 11c5c78afc51..b88f122922c3 100644
--- a/repetier-server.install
+++ b/repetier-server.install
@@ -6,6 +6,15 @@ post_install() {
     chmod 755 /opt/RepetierServer/modules/firmware/bin/avrdude
     chmod 755 /opt/RepetierServer/modules/firmware/bin/bossac
     chmod 755 /opt/RepetierServer/modules/firmware/bin/teensy_loader_cli
+
+    # Fix paths
+    sed -i 's|/usr/local/Repetier-Server/|/opt/RepetierServer/|g' /opt/RepetierServer/etc/RepetierServer.xml
+    sed -i 's|/usr/local/Repetier-Server/|/opt/RepetierServer/|g' /opt/RepetierServer/RepetierServer.service
+    sed -i 's|/var/lib/Repetier-Server/|/opt/RepetierServer/data/|g' /opt/RepetierServer/etc/RepetierServer.xml
+    sed -i 's|/var/lib/Repetier-Server|/opt/RepetierServer/data|g' /opt/RepetierServer/RepetierServer.service
+
+    # install systemd service
+    mv /opt/RepetierServer/RepetierServer.service /usr/lib/systemd/system/
     systemctl --system daemon-reload
 }
 
@@ -17,6 +26,7 @@ post_remove() {
     echo "Removing repetierserver system user"
     id -u repetierserver &>/dev/null && userdel repetierserver
     id -g repetierserver &>/dev/null && groupdel repetierserver
+    rm -r /usr/lib/systemd/system/RepetierServer.service
 }
 
 pre_remove() {