Reorganization and fixes

5 files changed, 44 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2114f3708d2..f610fd080402 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,21 @@
 pkgbase = ombi-dev
 	pkgdesc = Ombi V3 Develop branch. Gives Plex or Emby users the ability to request content by themselves
-	pkgver = 3.0.3039
+	pkgver = 3.0.3072
 	pkgrel = 1
-	url = https://www.ombi.io
+	url = https://github.com/tidusjar/Ombi
 	install = ombi.install
 	arch = any
 	license = GPL2
 	makedepends = tar
 	depends = libunwind
-	optdepends = sonarr
-	optdepends = radarr
-	optdepends = plex-media-server
-	optdepends = emby-server
+	depends = openssl-1.0
+	optdepends = sonarr: Automated TV show downloads
+	optdepends = sickrage: Automated TV show downloads
+	optdepends = radarr: Automated movie downloads
+	optdepends = couchpotato: Automated movie downloads
+	optdepends = plex-media-server: Plex media server
+	optdepends = plex-media-server-plexpass: Plex media server (Plexpass version)
+	optdepends = emby-server: Emby media server
 	provides = ombi
 	conflicts = ombi
 	replaces = plexrequests
@@ -22,9 +26,11 @@ pkgbase = ombi-dev
 	source = ombi-dev.tar.gz::https://ci.appveyor.com/api/projects/tidusjar/requestplex/artifacts/linux.tar.gz?branch=develop
 	source = ombi.service
 	source = ombi.sysusers
+	source = ombi.tmpfiles
 	sha256sums = SKIP
-	sha256sums = 601f9ba604c6767722397db977a9d73e800127d4a33c5511439e112d22660eba
-	sha256sums = 480941bb5c96b9e6a155d6feca16f56c74d7f13a49fc94f36132a548bd53dc0a
+	sha256sums = 79f4860eaf9d00d3739c6d9fc5e9625ea68dc329bb1cbddae5b51ae4faaae20f
+	sha256sums = 6efc381990e1113737686d4f61795095fa8edbc176daa877fd755f1ddb3a40fa
+	sha256sums = afb971692d313d988096cb4447033f8ca2234016ccc2b3590afd5cbcb36a8e56
 
 pkgname = ombi-dev
 
diff --git a/PKGBUILD b/PKGBUILD
index 21a34df5ed08..c86f926d01fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,21 @@
 # Contributor: Zack Baldwin <zack@zackb.com>
 
 pkgname=ombi-dev
-pkgver=3.0.3039
+pkgver=3.0.3072
 pkgrel=1
 pkgdesc="Ombi V3 Develop branch. Gives Plex or Emby users the ability to request content by themselves"
 arch=('any')
-url='https://www.ombi.io'
+url='https://github.com/tidusjar/Ombi'
 license=('GPL2')
-depends=('libunwind')
+depends=('libunwind' 'openssl-1.0')
 makedepends=('tar')
-optdepends=('sonarr' 'radarr' 'plex-media-server' 'emby-server')
+optdepends=('sonarr: Automated TV show downloads'
+            'sickrage: Automated TV show downloads'
+            'radarr: Automated movie downloads'
+            'couchpotato: Automated movie downloads' 
+            'plex-media-server: Plex media server' 
+            'plex-media-server-plexpass: Plex media server (Plexpass version)'
+            'emby-server: Emby media server')
 replaces=('plexrequests' 'ombi-beta')
 provides=('ombi')
 conflicts=('ombi')
@@ -22,19 +28,29 @@ install='ombi.install'
 noextract=("${pkgname}.tar.gz")
 source=("${pkgname}.tar.gz::https://ci.appveyor.com/api/projects/tidusjar/requestplex/artifacts/linux.tar.gz?branch=develop"
         'ombi.service'
-        'ombi.sysusers')
+        'ombi.sysusers'
+        'ombi.tmpfiles')
 sha256sums=('SKIP'
-            '601f9ba604c6767722397db977a9d73e800127d4a33c5511439e112d22660eba'
-            '480941bb5c96b9e6a155d6feca16f56c74d7f13a49fc94f36132a548bd53dc0a')
+            '79f4860eaf9d00d3739c6d9fc5e9625ea68dc329bb1cbddae5b51ae4faaae20f'
+            '6efc381990e1113737686d4f61795095fa8edbc176daa877fd755f1ddb3a40fa'
+            'afb971692d313d988096cb4447033f8ca2234016ccc2b3590afd5cbcb36a8e56')
 
 pkgver() {
   curl -s https://ci.appveyor.com/api/projects/tidusjar/requestplex/branch/develop | grep -Pom 1 '"version":"\K[^"]*'
 }
 
+prepare() {
+  mkdir -p "${srcdir}/ombi"
+  tar -xzf "${pkgname}.tar.gz" -C "${srcdir}/ombi"
+}
+
 package() {
   install -dm755 "${pkgdir}/opt/Ombi"
-  tar xzf "${pkgname}.tar.gz" -C "${pkgdir}/opt/Ombi"
+  cp -dpr --no-preserve=ownership "${srcdir}/ombi/"* "${pkgdir}/opt/Ombi/"
+  find ${pkgdir}/opt/Ombi/ -type f -exec chmod 644 '{}' ';'
+  find ${pkgdir}/opt/Ombi/ -type d -exec chmod 755 '{}' ';'
   chmod +x "${pkgdir}/opt/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.service b/ombi.service
index c7f7419e19eb..6a393e3113e2 100644
--- a/ombi.service
+++ b/ombi.service
@@ -7,10 +7,9 @@ User=ombi
 Group=ombi
 WorkingDirectory=/opt/Ombi
 Type=simple
-ExecStart=/opt/Ombi/Ombi
+ExecStart=/opt/Ombi/Ombi --storage /var/lib/ombi
 TimeoutStopSec=30
-Restart=on-failure
-RestartSec=5
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ombi.sysusers b/ombi.sysusers
index 189fa39e052f..0417286ec2f5 100644
--- a/ombi.sysusers
+++ b/ombi.sysusers
@@ -1 +1 @@
-u ombi - "ombi" /opt/Ombi
+u ombi - "ombi" /var/lib/ombi
diff --git a/ombi.tmpfiles b/ombi.tmpfiles
new file mode 100644
index 000000000000..8a556814c4bf
--- /dev/null
+++ b/ombi.tmpfiles
@@ -0,0 +1,3 @@
+d /var/lib/ombi 0755 ombi ombi
+Z /var/lib/ombi - ombi ombi
+Z /opt/Ombi - ombi ombi