From ed7f1122d604d604a58964f6261ec422784578a2 Mon Sep 17 00:00:00 2001
From: bradnelson <bradnelson@google.com>
Date: Wed, 30 Jun 2010 01:44:45 -0700
Subject: [PATCH] Fixing command line to work with file acls.

Merge branch 'gsd'

Merge branch 'master' into gsd

Fixing typo in command line.

Refactoring gsutil archiving into a function. Adding optional gsd_generate_index step.

Adding ACL option to archive_build.sh

Review URL: http://codereview.chromium.org/2847036
---
 archive_build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/archive_build.sh b/archive_build.sh
index c282b8169b..4acf138eb5 100755
--- a/archive_build.sh
+++ b/archive_build.sh
@@ -185,7 +185,6 @@ chmod 644 "$ZIPFILE" "${FLAGS_to}/LATEST"
 chmod 755 "$OUTDIR"
 
 
-GSUTIL_CP="${FLAGS_gsutil} cp -a ${FLAGS_acl}"
 GSUTIL_GENERATE_INDEX="${FLAGS_gsd_gen_index} -a ${FLAGS_acl}"
 
 function gsutil_archive() {
@@ -195,7 +194,8 @@ function gsutil_archive() {
   then
     FULL_OUT_PATH="${FLAGS_gsutil_archive}/${OUT_PATH}"
     echo "Using gsutil to archive to ${OUT_PATH}..."
-    ${GSUTIL_CP} ${IN_PATH} ${FULL_OUT_PATH}
+    ${FLAGS_gsutil} cp ${IN_PATH} ${FULL_OUT_PATH}
+    ${FLAGS_gsutil} setacl ${FLAGS_acl} ${FULL_OUT_PATH}
     if [ $FLAGS_gsd_gen_index != "" ]
     then
       echo "Updating indexes..."