From 51a2e575b5bc8ce32535f0aec1c46aea65ab2401 Mon Sep 17 00:00:00 2001
From: bradnelson <bradnelson@google.com>
Date: Wed, 30 Jun 2010 05:13:18 -0700
Subject: [PATCH] Fixing yet another path mistake.

BUG=None
TEST=None
TBR=djmm

Merge branch 'master' of ssh://chromiumos-git/crosutils

Fixing typo

BUG=None
TEST=None
TBR=djmm

Merge branch 'master' of ssh://chromiumos-git/crosutils

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/2881005
---
 archive_build.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/archive_build.sh b/archive_build.sh
index 96ba39ecdf..47847c00dc 100755
--- a/archive_build.sh
+++ b/archive_build.sh
@@ -185,8 +185,6 @@ chmod 644 "$ZIPFILE" "${FLAGS_to}/LATEST"
 chmod 755 "$OUTDIR"
 
 
-GSD_GENERATE_INDEX="${FLAGS_gsd_gen_index} -a ${FLAGS_acl}"
-
 function gsutil_archive() {
   IN_PATH="$1"
   OUT_PATH="$2"
@@ -199,7 +197,10 @@ function gsutil_archive() {
     if [ $FLAGS_gsd_gen_index != "" ]
     then
       echo "Updating indexes..."
-      ${GSD_GENERATE_INDEX} -p ${FULL_OUT_PATH} ${FLAGS_gsutil_archive}
+      ${FLAGS_gsd_gen_index} \
+        --gsutil=${FLAGS_gsutil} \
+        -a ${FLAGS_acl} \
+        -p ${FULL_OUT_PATH} ${FLAGS_gsutil_archive}
     fi
   fi
 }