Rework sudo handling.

1 files changed, 7 insertions, 6 deletions

diff --git a/control/deploy-control-node b/control/deploy-control-node
index b8afda2..429b8cf 100755
--- a/control/deploy-control-node
+++ b/control/deploy-control-node
@@ -23,13 +23,15 @@ function header() {
 function bzr_deploy() {
     bzr_repo=$1
     deploy_dir=$2
+    owner=$3
     if [ -e $deploy_dir -a ! -h $deploy_dir ]; then
-        mv $deploy_dir $deploy_dir.old
+        sudo mv $deploy_dir $deploy_dir.old
     fi
-    bzr branch $bzr_repo $deploy_dir.new
+    sudo bzr branch $bzr_repo $deploy_dir.new
     revno=`bzr revno $deploy_dir.new`
-    mv $deploy_dir.new $deploy_dir.r$revno-$TSTAMP
-    ln -sfn $deploy_dir.r$revno-$TSTAMP $deploy_dir
+    sudo mv $deploy_dir.new $deploy_dir.r$revno-$TSTAMP
+    sudo ln -sfn $deploy_dir.r$revno-$TSTAMP $deploy_dir
+    sudo chown -R $owner $deploy_dir.r$revno-$TSTAMP
 }
 
 # be sure to execute in deployment dir
@@ -56,9 +58,8 @@ function deploy_frontend() {
     header "Deploying linaro-android-frontend"
     sudo service apache2 stop
     cd ~build-system-frontend
-    sudo bzr_deploy lp:linaro-android-frontend frontend
+    bzr_deploy lp:linaro-android-frontend frontend
     sudo ln -s settings_prod.py frontend/
-    sudo chown -R build-system-frontend frontend/
     sudo service apache2 start
 }