From 439f0d3004401d8bbd5666fc34ab9c5d314ea151 Mon Sep 17 00:00:00 2001
From: arpit551 <imarpit03@gmail.com>
Date: Thu, 21 May 2020 01:43:57 +0530
Subject: [PATCH] install: Ad production support for Zulip on Ubuntu Focal.

Install script now runs on Focal.  Python 2 is now installed via the
`python2` package in Focal.
---
 puppet/zulip/manifests/base.pp |  2 ++
 scripts/lib/install            | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/puppet/zulip/manifests/base.pp b/puppet/zulip/manifests/base.pp
index 51fc6a9240..7e4a29d33e 100644
--- a/puppet/zulip/manifests/base.pp
+++ b/puppet/zulip/manifests/base.pp
@@ -15,6 +15,7 @@ class zulip::base {
         '15.10' => 'wily',
         '16.04' => 'xenial',
         '18.04' => 'bionic',
+        '20.04' => 'focal',
       }
       $base_packages = [
         # Accurate time is essential
@@ -67,6 +68,7 @@ class zulip::base {
     'xenial'  => '9.5',
     'bionic'  => '10',
     'CentOS7' => '10',
+    'focal'   => '12',
   })
 
   $normal_queues = [
diff --git a/scripts/lib/install b/scripts/lib/install
index 2f73f9c9b8..39a07a7903 100755
--- a/scripts/lib/install
+++ b/scripts/lib/install
@@ -105,7 +105,7 @@ if [ -f /etc/os-release ]; then
 fi
 
 case "$os_id$os_version_id" in
-    ubuntu16.04|ubuntu18.04|debian9|debian10) ;;
+    ubuntu16.04|ubuntu18.04|debian9|debian10|ubuntu20.04) ;;
     *)
         set +x
         cat <<EOF
@@ -203,9 +203,15 @@ fi
 
 case " $os_id $os_id_like " in
     *' debian '*)
+        if [ "$os_id" = ubuntu ] && [ "$os_version_id" = 20.04 ]; then
+            PYTHON2="python2"
+        else
+            PYTHON2="python"
+        fi
+
         if ! apt-get install -y \
             puppet git curl wget jq \
-            python python3 python-six python3-six crudini \
+            "$PYTHON2" python3 python-six python3-six crudini \
             "${ADDITIONAL_PACKAGES[@]}"; then
             set +x
             echo -e '\033[0;31m' >&2