diff options
| -rwxr-xr-x | install/ishtar-install | 45 |
1 files changed, 10 insertions, 35 deletions
diff --git a/install/ishtar-install b/install/ishtar-install index a34b1984c..8a51044ea 100755 --- a/install/ishtar-install +++ b/install/ishtar-install @@ -255,7 +255,7 @@ EOF ------------------------------------------------------------------------------- By default Ishtar base path is '/srv/'. With this base path Ishtar is - installed in '/srv/ishtar/choosen_version/'. + installed in '/srv/ishtar/'. EOF while [ "$install_path" == '' ] @@ -287,7 +287,7 @@ EOF # Run setup for each distro accordingly case "$lsb_dist" in ubuntu|debian) - if [ "$dist_version" != "stretch" ] && [ "$dist_version" != "jessie" ] && [ "$dist_version" != "wheezy" ]; then + if [ "$dist_version" != "stretch" ] && [ "$dist_version" != "jessie" ]; then echo "" cecho r " Sorry this script cannot manage your version of Debian/Ubuntu." echo "" @@ -324,36 +324,6 @@ EOF ( set -x; $sh_c 'sleep 3; apt-get install -y -q uwsgi uwsgi-plugin-python nginx' ) fi - if [ "$dist_version" == "wheezy" ]; then - if [ "$default_db" == '127.0.0.1' ]; then - echo "-------------------------------------------------------------------------------"; - cecho y "Installing postgresql" - echo "" - POSTGIS=postgresql-9.1-postgis - ( set -x; $sh_c 'sleep 3; apt-get install -y -q postgresql '$POSTGIS ) - fi - - echo "-------------------------------------------------------------------------------"; - cecho y "Installing Ishtar dependencies" - echo ""; - ( set -x; $sh_c 'sleep 3; apt-get install -y -q python python-django \ - libjs-jquery libjs-jquery-ui python-pisa python-django-registration \ - python-utidylib python-lxml python-imaging python-django-south \ - python-psycopg2 python-gdal gettext python-unicodecsv memcached \ - python-tidylib python-django-extra-views python-memcache python-dbf' ) - - echo "-------------------------------------------------------------------------------"; - cecho y "Installing BeautifulSoup4" - echo ""; - - ( set -x; $sh_c 'pip install BeautifulSoup4==4.3.2' ) - echo "-------------------------------------------------------------------------------"; - cecho y "Installing django-simple-history" - echo ""; - ( set -x; $sh_c 'pip install git+https://github.com/treyhunner/django-simple-history.git@0fd9b8e9c6f36b0141367b502420efe92d4e21ce' ) - - fi - if [ "$dist_version" == "jessie" ]; then if [ "$backports_activated" != 'true' ]; then echo "" @@ -379,7 +349,7 @@ EOF ( set -x; $sh_c 'sleep 3; apt-get install -t jessie-backports -y -q python python-django\ python-django-registration python-cffi' ) ( set -x; $sh_c 'sleep 3; apt-get install -y -q \ - python-bs4 python-django-formtools libpangocairo-1.0-0 \ + python-bs4 libpangocairo-1.0-0 \ python-tidylib python-lxml python-imaging python-html5lib \ python-psycopg2 python-gdal gettext python-unicodecsv memcached \ python-django-extra-views python-memcache python-dbf python-markdown' ) @@ -397,6 +367,9 @@ EOF cecho y "Installing weasyprint" echo ""; ( set -x; $sh_c 'pip install WeasyPrint==0.41' ) + cecho y "Installing django-formtools" + echo ""; + ( set -x; $sh_c 'pip install django-formtools==2.1' ) fi @@ -425,7 +398,7 @@ EOF ( set -x; $sh_c 'sleep 3; apt-get install -t stretch-backports -y -q python-django' ) ( set -x; $sh_c 'sleep 3; apt-get install -y -q \ python-django-registration libpangocairo-1.0-0 \ - python-bs4 python-django-formtools python-cffi \ + python-bs4 python-cffi \ python-tidylib python-lxml python-imaging python-html5lib \ python-psycopg2 python-gdal gettext python-unicodecsv memcached \ python-django-extra-views python-memcache python-dbf python-markdown \ @@ -441,7 +414,9 @@ EOF cecho y "Installing weasyprint" echo ""; ( set -x; $sh_c 'pip install WeasyPrint==0.41' ) - + cecho y "Installing django-formtools - Debian version is too old..." + echo ""; + ( set -x; $sh_c 'pip install django-formtools==2.1' ) fi ;; |