From c015dc50421cfd0a386b09d77ff9d59bc40991f5 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 24 Oct 2017 16:32:58 +0200
Subject: Install script: fix error when backports are not available

---
 install/ishtar-install | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'install')

diff --git a/install/ishtar-install b/install/ishtar-install
index dbf5defd7..2a9d6fc5b 100755
--- a/install/ishtar-install
+++ b/install/ishtar-install
@@ -118,14 +118,6 @@ do_install() {
         ;;
 
         debian)
-            MAINBACKS=`cat /etc/apt/sources.list | grep jessie-backports |grep -v "^#"`
-            ALLBACKS=''
-            if [ "$(ls -A /etc/apt/sources.list.d/)" ]; then
-                ALLBACKS=`cat /etc/apt/sources.list.d/* | grep jessie-backports |grep -v "^#"`
-            fi
-            if [ "$ALLBACKS" != '' ] || [ "$MAINBACKS" != '' ]; then
-                backports_activated='true';
-            fi
             dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')"
             case "$dist_version" in
                 9)
@@ -138,6 +130,16 @@ do_install() {
                     dist_version="wheezy"
                 ;;
             esac
+            set +e
+            MAINBACKS=`cat /etc/apt/sources.list | grep $dist_version'-backports' |grep -v "^#"`
+            ALLBACKS=''
+            if [ "$(ls -A /etc/apt/sources.list.d/)" ]; then
+                ALLBACKS=`cat /etc/apt/sources.list.d/* | grep $dist_version'-backports' |grep -v "^#"`
+            fi
+            set -e
+            if [ "$ALLBACKS" != '' ] || [ "$MAINBACKS" != '' ]; then
+                backports_activated='true';
+            fi
         ;;
 
         oracleserver)
-- 
cgit v1.2.3