summaryrefslogtreecommitdiffstats
path: root/maven-meeper
diff options
context:
space:
mode:
authorJason van Zyl <jvanzyl@apache.org>2006-11-06 00:29:02 +0000
committerJason van Zyl <jvanzyl@apache.org>2006-11-06 00:29:02 +0000
commit8706c17e639e7c08eda7ccbcdb0165c53db270c9 (patch)
tree9bd5963ddd46378ba25962c45040d0142696b5ca /maven-meeper
parent86ffd66d4604d6d543060e82e4b78d6e8a65e058 (diff)
downloadarchiva-8706c17e639e7c08eda7ccbcdb0165c53db270c9.tar.gz
archiva-8706c17e639e7c08eda7ccbcdb0165c53db270c9.zip
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
Diffstat (limited to 'maven-meeper')
-rwxr-xr-xmaven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh5
-rw-r--r--maven-meeper/src/bin/synchronize.properties1
-rwxr-xr-xmaven-meeper/src/bin/synchronize.sh2
3 files changed, 7 insertions, 1 deletions
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 6048d1a12..fa9f4d16b 100755
--- 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 b557651d5..f96322822 100644
--- 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 74d7b0eb3..7b04a5b5b 100755
--- 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