* Remove python3.6 from dependancies in debain control, to allow local python3.6+ installs to be utilized. Fixes #22

  * Include .git folder with previoud 10 commits, to allow the updater to work. Fixes #24
  * Check for python3.6+ versions in system path, and update the service file to the latest found. call 'dpkg-reconfigure sickchill' if it changes to update the service
  * Fix error in service where ExecStart path was not absolute. Fixes #25
  * No longer copy config from /apps/sickrage automatically, this could cause a data overwrite if users used the other repo.

Signed-off-by: miigotu <miigotu@gmail.com>

Author: miigotu

build_python.sh

@@ -14,7 +14,7 @@ apt-get install libreadline-gplv2-dev libncursesw5-dev libssl-dev libsqlite3-dev
 
 wget http://python.org/ftp/python/3.6.9\/Python-3.6.9.tar.xz
 tar xf Python-3.6.9.tar.xz
-cd Python-3.6.9
+cd Python-3.6.9 || exit 1
 ./configure --enable-optimizations --with-ensurepip=install
 make -j8
-make altinstall
+make checkinstall altinstall

debian/changelog

@@ -1,3 +1,13 @@
+sickchill (2021.03.09) UNRELEASED; urgency=medium
+
+  * Remove python3.6 from dependancies in debain control, to allow local python3.6+ installs to be utilized. Fixes #22
+  * Include .git folder with previoud 10 commits, to allow the updater to work. Fixes #24
+  * Check for python3.6+ versions in system path, and update the service file to the latest found. call 'dpkg-reconfigure sickchill' if it changes to update the service
+  * Fix error in service where ExecStart path was not absolute. Fixes #25
+  * No longer copy config from /apps/sickrage automatically, this could cause a data overwrite if users used the other repo.
+
+ -- miigotu <miigotu@gmail.com>  Tue, 09 Mar 2021 23:21:15 -0500
+
 sickchill (2021.02.24) stable; urgency=medium
 
   * Upstream Update

debian/control

@@ -14,7 +14,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          readynasos (>= 6.1.0),
          php5-sqlite,
-         python3 (>= 3.6),
+         sed,
          git
 Description: Searches torrent and nzb providers for shows.
  Manage your whole workflow and get episodes as soon as they are available.

debian/postinst

@@ -21,9 +21,11 @@ set -e
 case "$1" in
     configure)
         chown -R admin:admin /apps/sickchill
-        if [ -d "/apps/sickrage/app-config/" ] && [ ! -f /apps/sickchill/app-config/config.ini ]; then
-            cp -r /apps/sickrage/app-config/* /apps/sickchill/app-config/
-        fi
+        SC_PYTHON=$(command -v python3.9 || command -v python3.8 || command -v python3.7 || command -v python3.6)
+        [ -z $SC_PYTHON ] && (echo "Python 3.6+ not found in your path. After fixing this issue, call 'dpkg-reconfigure sickchill'" && exit 1)
+        echo "Found python3 at $SC_PYTHON, setting service to use this interpreter"
+        echo "If you change python versions or path, call 'dpkg-reconfigure sickchill' to fix the service"
+        sed -i "s#ExecStart=.* /apps/sickchill/SickChill.py#ExecStart=$SC_PYTHON /apps/sickchill/SickChill.py#g" /apps/sickchill/fvapp-sickchill.service
         ;;
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;

debian/rules

@@ -8,7 +8,9 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-export DH_ALWAYS_EXCLUDE=.git
+
+# We need the .git folder for git based updates.
+#export DH_ALWAYS_EXCLUDE=.git
 
 
 DESTDIR = $(CURDIR)/debian/sickchill
@@ -19,6 +21,6 @@ DESTDIR = $(CURDIR)/debian/sickchill
 override_dh_install:
 	cp -R $(CURDIR)/rn-files/* ${DESTDIR}/apps/sickchill
 	mkdir -p $(CURDIR)/git-files
-	if [ -d ./git-files/sickchill ]; then git --git-dir=./git-files/.git pull; fi
-	if [ ! -d ./git-files/sickchill ]; then git clone https://github.com/sickchill/sickchill.git ./git-files; fi
+	if [ -d ./git-files/sickchill ]; then git --git-dir=./git-files/.git --depth 10 pull; fi
+	if [ ! -d ./git-files/sickchill ]; then git clone --depth 10 https://github.com/sickchill/sickchill.git ./git-files; fi
 	cp -R $(CURDIR)/git-files/* ${DESTDIR}/apps/sickchill

rn-files/fvapp-sickchill.service

@@ -2,7 +2,7 @@
 Description=Service for sickchill app
 
 [Service]
-ExecStart=$(command -v python3.9 || command -v python3.8 || command -v python3.7 || command -v python3.6) /apps/sickchill/SickChill.py --nolaunch --datadir=/apps/sickchill/app-config --config=/apps/sickchill/app-config/config.ini --port=6766
+ExecStart=python3 /apps/sickchill/SickChill.py --nolaunch --datadir=/apps/sickchill/app-config --config=/apps/sickchill/app-config/config.ini --port=6766
 Restart=always
 Nice=18
 User=admin