From e67a8daeb0db4e74dc6534c1f44b1e1c2d1a99f6 Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Fri, 15 Oct 2010 19:04:07 +0000
Subject: [PATCH] OPENJPA-1836 Only perform chmod on files/dirs that the
 nightly.user.name owns

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1023072 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-project/upload.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/openjpa-project/upload.xml b/openjpa-project/upload.xml
index 79446bfd9..fa74e81f8 100644
--- a/openjpa-project/upload.xml
+++ b/openjpa-project/upload.xml
@@ -48,24 +48,27 @@
                 <include name="*.zip" />
             </fileset>
         </checksum>
-        
+
+        <!-- update ${build.dir}/apache-openjpa-${project.version}/docs -->
         <scp todir="${nightly.user.name}@${host}:${build.dir}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" trust="true" sftp="true">
             <fileset dir="target/site/tempDocs"> 
                 <include name="docs.zip"/>
             </fileset>
         </scp>
-        <!-- remove directories, hopefully this fails silently. mkdir does not and stops the process these exist.-->
         <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="rm -Rf ${build.dir}/apache-openjpa-${project.version}/docs" trust="true" />
-        <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="rm -Rf ${build.dir}/apache-openjpa-${project.version}/downloads" trust="true" />
         <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="unzip -qq -d ${build.dir}/ ${build.dir}/docs.zip" trust="true" />
         <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="rm ${build.dir}/docs.zip" trust="true" />
+
+        <!-- update ${build.dir}/apache-openjpa-${project.version}/downloads -->
+        <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="rm -Rf ${build.dir}/apache-openjpa-${project.version}/downloads" trust="true" />
         <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="mkdir ${build.dir}/apache-openjpa-${project.version}/downloads " trust="true" />
-        
         <scp todir="${nightly.user.name}@${host}:${build.dir}/apache-openjpa-${project.version}/downloads" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" trust="true">
             <fileset dir="target/site/downloads" />
         </scp>
         
-        <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="chmod -R g+w ${build.dir}/apache-openjpa-${project.version}" trust="true" />
+        <!-- update ACLs in ${build.dir}/apache-openjpa-${project.version} -->
+        <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="find ${build.dir}/apache-openjpa-${project.version} -user ${nightly.user.name} -type d | xargs chmod 775" trust="true" />
+        <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="find ${build.dir}/apache-openjpa-${project.version} -user ${nightly.user.name} -type f | xargs chmod 664" trust="true" />
         
         <delete>
             <fileset dir="target/site/tempDocs" />