Install script: python3

1 files changed, 32 insertions, 32 deletions

diff --git a/install/ishtar-install b/install/ishtar-install
index bf34d8a08..60636dbd5 100755
--- a/install/ishtar-install
+++ b/install/ishtar-install
@@ -348,7 +348,7 @@ EOF
                 echo "-------------------------------------------------------------------------------";
                 cecho y "Installing pip...";
                 echo "";
-                ( set -x; $sh_c 'sleep 3; apt-get install -y -q python-pip' )
+                ( set -x; $sh_c 'sleep 3; apt-get install -y -q python3-pip' )
             fi
 
             echo "-------------------------------------------------------------------------------";
@@ -357,14 +357,14 @@ EOF
             ( set -x; $sh_c 'sleep 3; apt-get install -y -q dnsmasq' )
 
             echo "-------------------------------------------------------------------------------";
-            cecho y "Installing python-setuptools...";
+            cecho y "Installing python3-setuptools...";
             echo "";
-            ( set -x; $sh_c 'sleep 3; apt-get install -y -q python-setuptools python-wheel' )
+            ( set -x; $sh_c 'sleep 3; apt-get install -y -q python3-setuptools python3-wheel' )
             if [ "$webserver" == 'nginx' ]; then
                 echo "-------------------------------------------------------------------------------";
                 cecho y "Installing nginx and uwsgi...";
                 echo "";
-                ( set -x; $sh_c 'sleep 3; apt-get install -y -q  uwsgi uwsgi-plugin-python nginx' )
+                ( set -x; $sh_c 'sleep 3; apt-get install -y -q  uwsgi uwsgi-plugin-python3 nginx' )
             fi
 
             if [ "$dist_version" == "stretch" ]; then
@@ -394,28 +394,28 @@ EOF
                 echo "";
 
                 if [ "$lsb_dist" == 'debian' ]; then
-                    ( 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 -t stretch-backports -y -q  python3-django' )
                     ( set -x; $sh_c 'sleep 3; apt-get install -y -q \
-                          python-django-registration libpangocairo-1.0-0 python-requests \
-                          python-bs4 python-cffi python-django-compressor pandoc libjs-jquery\
-                          python-tidylib python3-lxml python-imaging python-html5lib \
-                          python3-psycopg2 python-gdal gettext memcached \
-                          python-django-extra-views python-memcache python-dbf python-markdown \
-                          python-reportlab python-django-extensions python-unidecode' )
+                          python3-django-registration libpangocairo-1.0-0 python3-requests \
+                          python3-bs4 python3-cffi python3-django-compressor pandoc libjs-jquery\
+                          python3-tidylib python3-lxml python3-imaging python3-html5lib \
+                          python3-psycopg2 python3-gdal gettext memcached \
+                          python3-django-extra-views python3-memcache python3-dbf python3-markdown \
+                          python3-reportlab python3-django-extensions python3-unidecode' )
                 fi
                 if [ "$lsb_dist" == 'raspbian' ]; then
-                    ( set -x; $sh_c 'pip install django==1.11 \
+                    ( set -x; $sh_c 'pip3 install django==1.11 \
                                      django-registration==2.2 \
                                      django-compressor==2.1 \
                                      django-extra-views==0.2.4 \
                                      django-extensions==1.7.4' )
                     ( set -x; $sh_c 'sleep 3; apt-get install -y -q \
-                          libpangocairo-1.0-0 python-requests \
-                          python-bs4 python-cffi pandoc libjs-jquery \
-                          python-tidylib python-lxml python-imaging python-html5lib \
-                          python-psycopg2 python-gdal gettext memcached \
-                          python-memcache python-dbf python-markdown \
-                          python-reportlab python-unidecode' )
+                          libpangocairo-1.0-0 python3-requests \
+                          python3-bs4 python3-cffi pandoc libjs-jquery \
+                          python3-tidylib python3-lxml python3-imaging python3-html5lib \
+                          python3-psycopg2 python3-gdal gettext memcached \
+                          python3-memcache python3-dbf python3-markdown \
+                          python3-reportlab python3-unidecode' )
                 fi
 
                 if [ "$install_libreoffice" == 'yes' ]; then
@@ -423,37 +423,37 @@ EOF
                           libreoffice libreoffice-script-provider-python python3-uno' )
                 fi
 
-                # buster: python-pyqrcode python-png
+                # buster: python3-pyqrcode python3-png
                 echo "-------------------------------------------------------------------------------";
                 cecho y "Installing pyqrcode"
                 echo "";
-                ( set -x; $sh_c 'pip install pyqrcode==1.2.1' )
-                ( set -x; $sh_c 'pip install pypng==0.0.19' )
+                ( set -x; $sh_c 'pip3 install pyqrcode==1.2.1' )
+                ( set -x; $sh_c 'pip3 install pypng==0.0.19' )
 
                 echo "-------------------------------------------------------------------------------";
                 cecho y "Installing django-simple-history"
                 echo "";
-                ( set -x; $sh_c 'pip install git+https://github.com/treyhunner/django-simple-history.git@1.8.2#egg=django-simple-history' )
+                ( set -x; $sh_c 'pip3 install git+https://github .com/treyhunner/django-simple-history.git@1.8.2#egg=django-simple-history' )
                 echo "-------------------------------------------------------------------------------";
-                cecho y "Installing python-secretary"
+                cecho y "Installing python3-secretary"
                 echo "";
-                ( set -x; $sh_c 'pip install secretary==0.2.14' )
+                ( set -x; $sh_c 'pip3 install secretary==0.2.14' )
                 cecho y "Installing weasyprint"
                 echo "";
-                ( set -x; $sh_c 'pip install WeasyPrint==0.41' )
-                cecho y "Installing python-ajax-select - Debian version is too old..."
+                ( set -x; $sh_c 'pip3 install WeasyPrint==0.41' )
+                cecho y "Installing python3-ajax-select - Debian version is too old..."
                 echo "";
-                ( set -x; $sh_c 'pip install django-ajax-selects==1.6.0' )
+                ( set -x; $sh_c 'pip3 install django-ajax-selects==1.6.0' )
                 cecho y "Installing django-formtools - Debian version is too old..."
                 echo "";
-                ( set -x; $sh_c 'pip install django-formtools==2.1' )
-                cecho y "Installing  python-virtualtime"
+                ( set -x; $sh_c 'pip3 install django-formtools==2.1' )
+                cecho y "Installing  python3-virtualtime"
                 echo "";
-                ( set -x; $sh_c 'pip install virtualtime==1.6' )
+                ( set -x; $sh_c 'pip3 install virtualtime==1.6' )
                 ## not mandatory
-                # cecho y "Installing  python-django-background-tasks"
+                # cecho y "Installing  python3-django-background-tasks"
                 # echo "";
-                #( set -x; $sh_c 'pip install django-background-tasks==1.1.11'
+                #( set -x; $sh_c 'pip3 install django-background-tasks==1.1.11'
                 #)
             fi
             ;;