summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Patrovic2016-06-22 09:12:49 -0400
committerOndrej Patrovic2016-06-22 09:12:49 -0400
commit7d4ecaa2787203c9600253d39cfb112cd3fa19cc (patch)
treee386ca6d822ce18355840b6faf2c382115cb23f6
parent522f797b4b651f1e0c988f0198087d4481e92c04 (diff)
downloadaur-sickgear-git.tar.gz
* Set SickGear git origin to allow updates
* Fix daemon-reload on install * Fix typo on PKGBUILD prepare section
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
-rw-r--r--fix-signal-handling.patch12
-rw-r--r--sickgear.install3
4 files changed, 19 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e95714c1a57a..cd058e8e810a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sickgear-git
pkgdesc = Provides management of TV shows and/or Anime, detects new episodes, links to downloader apps, and more.
pkgver = 0.11.12.r0.g9198eb6
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/SickGear/SickGear
install = sickgear.install
arch = any
@@ -32,7 +32,7 @@ pkgbase = sickgear-git
sha256sums = 76108d56417bc6e5352db779c7e74812eda07b440cc293547809aa9504e10209
sha256sums = 5c7a327168f2b2d361eeaa9e9f82e79a87381908d8ba6b1d1eb90ac64ad38ac2
sha256sums = 54873ee12aa334a0c0830dbe48251f994d8ae851ae0b55250c098ff9f7f9ea60
- sha256sums = fae4616bf9dbf19d5bb2fcc89abd49b27db9f1f0181589a60bbcde07b840ae99
+ sha256sums = 8da4938dbba87fbb7c88715d03ceff51544ed79cff3c8ea0ed31866a7d345083
sha256sums = SKIP
pkgname = sickgear-git
diff --git a/PKGBUILD b/PKGBUILD
index e488fa12f84d..e05c536e4684 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=sickgear
pkgname=${_pkgname}-git
pkgver=0.11.12.r0.g9198eb6
-pkgrel=2
+pkgrel=3
pkgdesc="Provides management of TV shows and/or Anime, detects new episodes, links to downloader apps, and more."
arch=('any')
url="https://github.com/SickGear/SickGear"
@@ -28,16 +28,18 @@ conflicts=(${_pkgname}
options=('!strip')
install=${_pkgname}.install
+_source="https://github.com/SickGear/SickGear.git"
+
source=('sickgear.service'
'sickgear.tmpfiles'
'sickgear.sysusers'
'fix-signal-handling.patch'
- "${_pkgname}::git+https://github.com/SickGear/SickGear.git")
+ "${_pkgname}::git+${_source}")
sha256sums=('76108d56417bc6e5352db779c7e74812eda07b440cc293547809aa9504e10209'
'5c7a327168f2b2d361eeaa9e9f82e79a87381908d8ba6b1d1eb90ac64ad38ac2'
'54873ee12aa334a0c0830dbe48251f994d8ae851ae0b55250c098ff9f7f9ea60'
- 'fae4616bf9dbf19d5bb2fcc89abd49b27db9f1f0181589a60bbcde07b840ae99'
+ '8da4938dbba87fbb7c88715d03ceff51544ed79cff3c8ea0ed31866a7d345083'
'SKIP')
pkgver() {
@@ -46,7 +48,10 @@ pkgver() {
}
prepare() {
- cd "${_pkname}"
+ cd "${_pkgname}"
+
+ # Change origin back to upstream to allow updates
+ git remote set-url origin "${_source}"
# Patch to fix SIGINT and SIGTERM signal handling
patch -Np1 -i "${srcdir}/fix-signal-handling.patch"
diff --git a/fix-signal-handling.patch b/fix-signal-handling.patch
index cc219ae8967c..3520787099ac 100644
--- a/fix-signal-handling.patch
+++ b/fix-signal-handling.patch
@@ -1,14 +1,14 @@
---- a/sickgear/sickbeard/__init__.py
-+++ b/sickgear/sickbeard/__init__.py
+--- a/sickbeard/__init__.py
++++ b/sickbeard/__init__.py
@@ -1339,9 +1339,8 @@
-
-
+
+
def sig_handler(signum=None, frame=None):
- if isinstance(signum, type(None)):
- logger.log(u'Signal %i caught, saving and exiting...' % int(signum))
- events.put(events.SystemEvent.SHUTDOWN)
+ logger.log(u'Signal %i caught, saving and exiting...' % int(signum))
+ events.put(events.SystemEvent.SHUTDOWN)
-
-
+
+
def save_all():
diff --git a/sickgear.install b/sickgear.install
index f0904ae2cf18..b8e8bf3e4e8c 100644
--- a/sickgear.install
+++ b/sickgear.install
@@ -2,6 +2,8 @@ post_install() {
systemd-sysusers sickgear.conf
systemd-tmpfiles --create sickgear.conf
+ systemctl daemon-reload &> /dev/null
+
if [ ! -d /opt/sickgear/data ]; then
mkdir -p -m 755 /opt/sickgear/data &> /dev/null
@@ -34,7 +36,6 @@ pre_upgrade() {
post_upgrade() {
post_install
- systemctl daemon-reload &> /dev/null
if systemctl is-enabled sickgear.service &> /dev/null; then
systemctl start sickgear.service