diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-24 16:32:58 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-24 16:32:58 +0200 |
| commit | e0cc865516f69dcea9649e571d2f3a71963bfbb4 (patch) | |
| tree | a4c52cf798b731b72263b48e15f0171233c96f40 /install | |
| parent | 9e89ad86fa08ec4a007d4a34339f9f93b7701254 (diff) | |
| download | Ishtar-e0cc865516f69dcea9649e571d2f3a71963bfbb4.tar.bz2 Ishtar-e0cc865516f69dcea9649e571d2f3a71963bfbb4.zip | |
Install script: fix error when backports are not available
Diffstat (limited to 'install')
| -rwxr-xr-x | install/ishtar-install | 18 |
1 files changed, 10 insertions, 8 deletions
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) |