diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-01 16:15:00 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-01 16:15:28 +0200 |
| commit | e0cc2800330d92ad577384ea72659427918f589d (patch) | |
| tree | 8677918f012283eda9005ba5c14b03ad67c3fb89 | |
| parent | ab35d056b3283ebf5930da9b05a93b7fae5fc8d0 (diff) | |
| download | Ishtar-e0cc2800330d92ad577384ea72659427918f589d.tar.bz2 Ishtar-e0cc2800330d92ad577384ea72659427918f589d.zip | |
Install: fix dependency and backport check
| -rw-r--r-- | install/install-ishtar.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/install/install-ishtar.sh b/install/install-ishtar.sh index 2a26dfbf8..16e758c57 100644 --- a/install/install-ishtar.sh +++ b/install/install-ishtar.sh @@ -75,11 +75,6 @@ EOF fi if [ -z "$lsb_dist" ] && [ -r /etc/debian_version ]; then lsb_dist='debian' - MAINBACKS=`cat /etc/apt/sources.list | grep jessie-backports |grep -v "^#"` - ALLBACKS=`cat /etc/apt/sources.list.d/*.list | grep jessie-backports |grep -v "^#"` - if [ "$ALLBACKS" != '' ] || [ "$MAINBACKS" != '' ]; then - backports_activated='true'; - fi fi if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then lsb_dist='fedora' @@ -110,6 +105,14 @@ EOF ;; 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 8) @@ -214,7 +217,7 @@ EOF case "$choice" in develop ) version="develop";; master ) version="master";; - '' ) version="stable";; + '' ) version="develop";; esac done @@ -349,7 +352,8 @@ EOF fi echo "Installing Ishtar dependencies" echo ""; - ( set -x; $sh_c 'sleep 3; apt-get install -y -q python python-django \ + ( set -x; $sh_c 'sleep 3; apt-get install -t jessie-backports -y -q python python-django' ) + ( set -x; $sh_c 'sleep 3; apt-get install -y -q \ python-pisa python-django-registration python-bs4 python-django-formtools\ python-tidylib python-lxml python-imaging python-html5lib\ python-psycopg2 python-gdal gettext python-unicodecsv memcached \ |