Update to v3.0.2970.

5 files changed, 78 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e31d79d9cf71..774f8f6d9c45 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,36 @@
-# Generated by mksrcinfo v8
-# Sun Apr 16 03:44:11 UTC 2017
 pkgbase = ombi
 	pkgdesc = Simple automated way for users to request new content for Plex
-	pkgver = 2.2.1
-	pkgrel = 3
+	pkgver = 3.0.2970
+	pkgrel = 1
 	url = https://github.com/tidusjar/Ombi
 	install = ombi.install
-	arch = any
+	arch = x86_64
+	arch = i686
+	arch = armv7h
 	license = GPL2
-	depends = mono
-	optdepends = couchpotato
-	optdepends = sickrage
-	optdepends = sonarr
-	optdepends = plex-media-server
-	optdepends = plex-media-server-plexpass
-	optdepends = headphones
+	depends = libunwind
+	optdepends = sonarr: TV daemon for usenet & torrents
+	optdepends = radarr: Movie daemon for usenet & torrents (sonarr fork)
+	optdepends = sickrage: TV daemon for usenet & torrents (sickbeard fork)
+	optdepends = couchpotato: Movie daemon for usenet & torrents
+	optdepends = plex-media-server: Media server
+	optdepends = plex-media-server-plexpass: Media server (plexpass version)
+	optdepends = emby-server: Media server
 	replaces = plexrequests
-	source = ombi-2.2.1.zip::https://github.com/tidusjar/Ombi/releases/download/v2.2.1/Ombi.zip
+	noextract = ombi-x86_64-3.0.2970.tar.gz
+	noextract = ombi-i686-3.0.2970.tar.gz
+	noextract = ombi-armv7h-3.0.2970.tar.gz
+	options = staticlibs
 	source = ombi.service
 	source = ombi.sysusers
-	sha256sums = 1746d9df25bb20311bc823e9c7ea0347ba7a092cc03f620f8fa7245e912fa134
-	sha256sums = 2407c8183aa48f8666063169dc79d0cbdb99a01b11cdf47c168ce8f2c990d3f8
-	sha256sums = 27704e4b5c5d944b774bf4d180684ff76f157d37ba9c5e39f7d03493962c81c6
+	sha256sums = d5893f6b665a0646054343a051e462a49569d51de224b45d3d2542b6c4e3d168
+	sha256sums = 6efc381990e1113737686d4f61795095fa8edbc176daa877fd755f1ddb3a40fa
+	source_x86_64 = ombi-x86_64-3.0.2970.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v3.0.2970/linux.tar.gz
+	sha256sums_x86_64 = 1de418f83fd8ca230c0e0fbed049acde045132f667af54cf9763d44aec500699
+	source_i686 = ombi-i686-3.0.2970.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v3.0.2970/linux.tar.gz
+	sha256sums_i686 = 1de418f83fd8ca230c0e0fbed049acde045132f667af54cf9763d44aec500699
+	source_armv7h = ombi-armv7h-3.0.2970.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v3.0.2970/linux-arm.tar.gz
+	sha256sums_armv7h = fb5cd416074f90daec881570b9c12bac2934eaf9de5c2f7dbe27955b8de3eb77
 
 pkgname = ombi
 
diff --git a/PKGBUILD b/PKGBUILD
index 6398118ce621..980ade5bb53a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,61 @@
 # Maintainer: Zack Baldwin <zack@zackb.com>
 
 pkgname=ombi
-pkgver=2.2.1
-pkgrel=3
+pkgver=3.0.2970
+pkgrel=1
 pkgdesc="Simple automated way for users to request new content for Plex"
-arch=('any')
+arch=('x86_64' 'i686' 'armv7h')
 url="https://github.com/tidusjar/Ombi"
 license=('GPL2')
-depends=('mono')
-optdepends=('couchpotato' 'sickrage' 'sonarr' 'plex-media-server' 'plex-media-server-plexpass' 'headphones')
+depends=('libunwind')
+optdepends=('sonarr: TV daemon for usenet & torrents'
+            'radarr: Movie daemon for usenet & torrents (sonarr fork)'
+            'sickrage: TV daemon for usenet & torrents (sickbeard fork)'
+            'couchpotato: Movie daemon for usenet & torrents'
+            'plex-media-server: Media server'
+            'plex-media-server-plexpass: Media server (plexpass version)'
+            'emby-server: Media server')
 replaces=('plexrequests')
 install='ombi.install'
-source=("${pkgname}-${pkgver}.zip::https://github.com/tidusjar/Ombi/releases/download/v${pkgver}/Ombi.zip"
-        "${pkgname}.service"
+options=('staticlibs')
+
+source=("${pkgname}.service"
         "${pkgname}.sysusers")
 
-sha256sums=('1746d9df25bb20311bc823e9c7ea0347ba7a092cc03f620f8fa7245e912fa134'
-            '2407c8183aa48f8666063169dc79d0cbdb99a01b11cdf47c168ce8f2c990d3f8'
-            '27704e4b5c5d944b774bf4d180684ff76f157d37ba9c5e39f7d03493962c81c6')
-                        
+source_x86_64=("${pkgname}-x86_64-${pkgver}.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v${pkgver}/linux.tar.gz")
+source_i686=("${pkgname}-i686-${pkgver}.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v${pkgver}/linux.tar.gz")
+source_armv7h=("${pkgname}-armv7h-${pkgver}.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v${pkgver}/linux-arm.tar.gz")
+
+noextract=("${pkgname}-x86_64-${pkgver}.tar.gz"
+           "${pkgname}-i686-${pkgver}.tar.gz"
+           "${pkgname}-armv7h-${pkgver}.tar.gz")
+
+sha256sums=('d5893f6b665a0646054343a051e462a49569d51de224b45d3d2542b6c4e3d168'
+            '6efc381990e1113737686d4f61795095fa8edbc176daa877fd755f1ddb3a40fa')
+sha256sums_x86_64=('1de418f83fd8ca230c0e0fbed049acde045132f667af54cf9763d44aec500699')
+sha256sums_i686=('1de418f83fd8ca230c0e0fbed049acde045132f667af54cf9763d44aec500699')
+sha256sums_armv7h=('fb5cd416074f90daec881570b9c12bac2934eaf9de5c2f7dbe27955b8de3eb77')
+
+
+
+prepare() {
+  # The source is packaged w/o a sub directory, so create our own and 
+  # extract to it. Arm package has a different name too.
+  mkdir -p "${srcdir}/ombi"
+  bsdtar -x -C "${srcdir}/ombi" -f "${pkgname}-${CARCH}-${pkgver}.tar.gz"
+}
+
 package() {
-  install -d "${pkgdir}/opt/${pkgname}"
-  cp -r "Release/." "${pkgdir}/opt/${pkgname}"
-  #install -Dm644 "Release/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+  install -d -m 755 "${pkgdir}/var/lib/ombi"
+  install -d -m 755 "${pkgdir}/usr/lib/ombi"
+
+  # Copy in files and then fix permissions
+  cp -dpr --no-preserve=ownership "${srcdir}/ombi/"* "${pkgdir}/usr/lib/ombi/"
+  find ${pkgdir}/usr/lib/ombi/ -type f -exec chmod 644 '{}' ';'
+  find ${pkgdir}/usr/lib/ombi/ -type d -exec chmod 755 '{}' ';'
+  chmod 755 ${pkgdir}/usr/lib/ombi/Ombi
+
+  install -Dm644 "${srcdir}/ombi.service" "${pkgdir}/usr/lib/systemd/system/ombi.service"
   install -Dm644 "${srcdir}/ombi.sysusers" "${pkgdir}/usr/lib/sysusers.d/ombi.conf"
 }
 
diff --git a/ombi.install b/ombi.install
index b2e99a8c4c30..af389eeb6eec 100644
--- a/ombi.install
+++ b/ombi.install
@@ -1,14 +1,9 @@
 post_install() {
-  # Create plex user
+  # Create ombi user
   systemd-sysusers ombi.conf
-  chown -R ombi:ombi /opt/ombi
+  chown -R ombi:ombi /var/lib/ombi
 }
 
 post_upgrade() {
-  systemctl daemon-reload
-}
-
-post_remove() {
-  systemctl stop ombi.service
-  true
+  post_install $1
 }
diff --git a/ombi.service b/ombi.service
index c34cb9c1e20e..dd1f60935384 100644
--- a/ombi.service
+++ b/ombi.service
@@ -5,9 +5,9 @@ After=network.target
 [Service]
 User=ombi
 Group=ombi
-WorkingDirectory=/opt/ombi
 Type=simple
-ExecStart=/usr/bin/mono /opt/ombi/Ombi.exe -p 3579
+WorkingDirectory=/usr/lib/ombi
+ExecStart=/usr/lib/ombi/Ombi --storage /var/lib/ombi
 Restart=always
 TimeoutStopSec=30
 
diff --git a/ombi.sysusers b/ombi.sysusers
index 3c4e49722685..0417286ec2f5 100644
--- a/ombi.sysusers
+++ b/ombi.sysusers
@@ -1 +1 @@
-u ombi - "ombi" /opt/ombi
+u ombi - "ombi" /var/lib/ombi