From 3f95e567c1cae40206c900659a723337673a4907 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@mit.edu>
Date: Sat, 30 Jul 2016 21:30:45 -0700
Subject: [PATCH] Use apt-add-repository to setup Zulip PPA.

---
 scripts/lib/install        |  4 ++--
 scripts/lib/setup-apt-repo | 18 ------------------
 tools/provision.py         |  3 ++-
 3 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100755 scripts/lib/setup-apt-repo

diff --git a/scripts/lib/install b/scripts/lib/install
index c0de057aed..154681d133 100755
--- a/scripts/lib/install
+++ b/scripts/lib/install
@@ -15,8 +15,8 @@ DEPLOYMENT_TYPE="${DEPLOYMENT_TYPE:-voyager}"
 PUPPET_CLASSES="${PUPPET_CLASSES:-zulip::voyager}"
 VIRTUALENV_NEEDED="${VIRTUALENV_NEEDED:-yes}"
 
-/root/zulip/scripts/lib/setup-apt-repo
-
+# Add the Zulip PPA
+apt-add-repository --enable-source --yes ppa:tabbott/zulip
 apt-get update
 apt-get -y dist-upgrade $APT_OPTIONS
 apt-get install -y puppet git python python-six crudini $ADDITIONAL_PACKAGES
diff --git a/scripts/lib/setup-apt-repo b/scripts/lib/setup-apt-repo
deleted file mode 100755
index 735d850fc7..0000000000
--- a/scripts/lib/setup-apt-repo
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-set -x
-set -x
-
-apt-get install -y lsb-release
-
-# First, install any updates from the apt repo that may be needed
-wget -qO - https://zulip.com/dist/keys/zulip-ppa.asc | apt-key add -
-release=$(lsb_release -sc)
-if [ "$release" = "trusty" ] || [ "$release" = "xenial" ]; then
-    cat >/etc/apt/sources.list.d/zulip.list <<EOF
-deb http://ppa.launchpad.net/tabbott/zulip/ubuntu $release main
-deb-src http://ppa.launchpad.net/tabbott/zulip/ubuntu $release main
-EOF
-else
-    echo "Unsupported release $release."
-    exit 1
-fi
diff --git a/tools/provision.py b/tools/provision.py
index 49994fef95..f0806592b7 100755
--- a/tools/provision.py
+++ b/tools/provision.py
@@ -159,7 +159,8 @@ def main():
     # project.
     os.chdir(ZULIP_PATH)
 
-    run(["sudo", "./scripts/lib/setup-apt-repo"])
+    # Add the Zulip PPA and install apt dependencies
+    run(["sudo", "apt-add-repository", "--enable-source", "--yes", "ppa:tabbott/zulip"])
     run(["sudo", "apt-get", "update"])
     run(["sudo", "apt-get", "-y", "install", "--no-install-recommends"] + APT_DEPENDENCIES[codename])