From 73cb361896d0bcf5374ce45785edebd850291ceb Mon Sep 17 00:00:00 2001
From: Greg Price <gnprice@gmail.com>
Date: Wed, 9 Aug 2017 17:28:36 -0700
Subject: [PATCH] install-aws-server: Cut out use of /root/zulip .

Our previous dependencies on the `/root/zulip` path should all be
long gone at this point.  Use a fresh temporary directory instead;
that's cleaner.
---
 tools/setup/install-aws-server | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/setup/install-aws-server b/tools/setup/install-aws-server
index 5cdbf0f127..a56f2ace2e 100755
--- a/tools/setup/install-aws-server
+++ b/tools/setup/install-aws-server
@@ -92,7 +92,7 @@ sed -i 's/localhost$/localhost $hostname/' /etc/hosts
 apt-get update
 apt-get -y upgrade
 
-cd /root
+cd "$(mktemp -d)"
 if ! [ -e "zulip" ]; then
     # need to install git to clone the repo
     apt-get install -y git crudini
@@ -102,7 +102,8 @@ cd zulip
 git fetch
 git checkout origin/$branch
 # The main Zulip production install script can take things from here!
-env VIRTUALENV_NEEDED=$VIRTUALENV_NEEDED PUPPET_CLASSES="$type" /root/zulip/scripts/setup/install
+env VIRTUALENV_NEEDED=$VIRTUALENV_NEEDED PUPPET_CLASSES="$type" \
+  ./scripts/setup/install
 EOF
 
 set +x