From 5938933dbbb4e9e5e9d01485ce758b121c498a82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Sun, 10 Mar 2019 18:13:02 +0100
Subject: [PATCH] Fix file permissions in aws instance

Env folders were being created for user root.
---
 cloud/aws.sh | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/cloud/aws.sh b/cloud/aws.sh
index 8d4404d..f21cb6b 100755
--- a/cloud/aws.sh
+++ b/cloud/aws.sh
@@ -1,14 +1,14 @@
 #! /bin/bash -e
 # Provision an AWS cloud instance with tutor.
-# Run with: curl -sSL https://raw.githubusercontent.com/regisb/tutor/master/cloud/aws.sh | sudo bash -e
+# Run with: curl -sSL https://raw.githubusercontent.com/regisb/tutor/master/cloud/aws.sh | bash -e
 
-export TUTOR_USER="$SUDO_USER"
+export TUTOR_USER="$USER"
 export DEBIAN_FRONTEND=noninteractive 
 
 echo "=============== Installing system dependencies"
-apt update \
-    && apt upgrade -y \
-    && apt install -y \
+sudo apt update \
+    && sudo apt upgrade -y \
+    && sudo apt install -y \
         apt-transport-https \
         ca-certificates \
         curl \
@@ -17,23 +17,23 @@ apt update \
         supervisor
 
 echo "=============== Installing docker"
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-add-apt-repository \
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+sudo add-apt-repository \
    "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
    $(lsb_release -cs) \
    stable"
-apt update
-apt install -y docker-ce docker-ce-cli containerd.io
+sudo apt update
+sudo apt install -y docker-ce docker-ce-cli containerd.io
+sudo usermod -aG docker $TUTOR_USER
 docker run hello-world
-usermod -aG docker $TUTOR_USER
 
 echo "=============== Installing docker-compose"
-curl -L "https://github.com/docker/compose/releases/download/1.23.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-chmod +x /usr/local/bin/docker-compose
+sudo curl -L "https://github.com/docker/compose/releases/download/1.23.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+sudo chmod +x /usr/local/bin/docker-compose
 
 echo "=============== Installing tutor"
-curl -L "https://github.com/regisb/tutor/releases/download/latest/tutor-$(uname -s)_$(uname -m)" -o /usr/local/bin/tutor
-chmod +x /usr/local/bin/tutor
+sudo curl -L "https://github.com/regisb/tutor/releases/download/latest/tutor-$(uname -s)_$(uname -m)" -o /usr/local/bin/tutor
+sudo chmod +x /usr/local/bin/tutor
 
 echo "=============== Building docker images"
 tutor images env
@@ -47,5 +47,5 @@ echo "[program:tutor]
 command=/usr/local/bin/tutor webui start
 environment=HOME=/home/$TUTOR_USER
 autorestart=true
-user=$TUTOR_USER" > /etc/supervisor/conf.d/tutor.conf
-supervisorctl update
+user=$TUTOR_USER" | sudo tee /etc/supervisor/conf.d/tutor.conf
+sudo supervisorctl update