o adding SYNC_REPORTS envar and using it the conversion report

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@471581 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh b/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh
index 6048d1a12b9781eb9aa9912d2f27f12c88d42ce9..fa9f4d16be0bb8eeaaff01737ce09ceb79962245 100755 (executable)
--- a/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh
+++ b/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh
@@ -1,11 +1,16 @@
 #!/bin/sh
 
+syncProperties=$1
+
+. $syncProperties
+
 java -jar archiva-cli-1.0-SNAPSHOT-cli.jar -c synchronize.properties
 #java -jar archiva-cli-1.0-SNAPSHOT-cli.jar -c synchronize-java.net.properties
 
 dir=/home/maven/repository-staging/to-ibiblio
 src=$dir/maven2-converted-from-maven1
 dst=$dir/maven2
+log=$SYNC_REPORTS/last-changes.log
 
 rsync --ignore-existing -rvpl $src/ $dst/ > $log
 

diff --git a/maven-meeper/src/bin/synchronize.properties b/maven-meeper/src/bin/synchronize.properties
index b557651d5f84de03bf47b6fb8a1b40917c181897..f96322822caeced2ae8afcfaf73761a981db8760 100644 (file)
--- a/maven-meeper/src/bin/synchronize.properties
+++ b/maven-meeper/src/bin/synchronize.properties
@@ -7,6 +7,7 @@ export SYNCOPATE=$SYNC_TOOLS/syncopate
 export M2_SYNC=$SYNC_TOOLS/m2-sync
 export REPOCLEAN=$TOOLS_BASE/m1-m2-conversion
 export M1_M2_REWRITE_RULES=$SYNC_TOOLS/m1-m2-mod-rewrite-rules.txt
+export SYNC_REPORTS=$HOME/repository-staging/to-ibiblio/reports/sync
 
 export STAGING_DIR=$HOME/repository-staging/to-ibiblio
 export MAVEN1_REPO=$STAGING_DIR/maven

diff --git a/maven-meeper/src/bin/synchronize.sh b/maven-meeper/src/bin/synchronize.sh
index 74d7b0eb392dacf25bfd13681121e00b957f4b86..7b04a5b5bc220f49604e5efe06b2c4e09bf16d66 100755 (executable)
--- a/maven-meeper/src/bin/synchronize.sh
+++ b/maven-meeper/src/bin/synchronize.sh
@@ -120,4 +120,4 @@ cp $M1_M2_REWRITE_RULES $MAVEN1_REPO/.htaccess
     
 scp $M1_M2_REWRITE_RULES maven@login.ibiblio.org:/public/html/maven/.htaccess   
 
-) 2>&1 | tee $HOME/repository-staging/to-ibiblio/reports/sync/last-sync-results.txt
+) 2>&1 | tee $SYNC_REPORTS/last-sync-results.txt