diff --git a/maven-meeper/src/bin/synchronize.properties b/maven-meeper/src/bin/synchronize.properties index 5ef9a6068..b557651d5 100644 --- a/maven-meeper/src/bin/synchronize.properties +++ b/maven-meeper/src/bin/synchronize.properties @@ -7,3 +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 STAGING_DIR=$HOME/repository-staging/to-ibiblio +export MAVEN1_REPO=$STAGING_DIR/maven +export MAVEN2_REPO=$STAGING_DIR/maven2 diff --git a/maven-meeper/src/bin/synchronize.sh b/maven-meeper/src/bin/synchronize.sh index e06d30879..281a1df28 100755 --- a/maven-meeper/src/bin/synchronize.sh +++ b/maven-meeper/src/bin/synchronize.sh @@ -72,7 +72,7 @@ retval=$?; if [ $retval != 0 ]; then exit $retval; fi echo "Removing commons-logging 1.1-dev" # hack prevent commons-logging-1.1-dev -CL=$HOME/repository-staging/to-ibiblio/maven2/commons-logging/commons-logging +CL=$MAVEN2_REPO/commons-logging/commons-logging rm -rf $CL/1.1-dev grep -v 1.1-dev $CL/maven-metadata.xml > $CL/maven-metadata.xml.tmp mv $CL/maven-metadata.xml.tmp $CL/maven-metadata.xml @@ -113,10 +113,6 @@ retval=$?; if [ $retval != 0 ]; then exit $retval; fi echo "Copying rewrite rules into place" -if [ "hostname" == $CENTRAL_HOST ]; then - cp $M1_M2_REWRITE_RULES $HOME/repository-staging/to-ibiblio/maven/.htaccess -else - scp $M1_M2_REWRITE_RULES maven@maven.org:~maven/repository-staging/to-ibiblio/maven/.htaccess -fi +cp $M1_M2_REWRITE_RULES $MAVEN1_REPO/.htaccess scp $M1_M2_REWRITE_RULES maven@login.ibiblio.org:/public/html/maven/.htaccess