Author: jvanzyl
Date: Sat Nov 4 17:26:12 2006
New Revision: 471317
URL: http://svn.apache.org/viewvc?view=rev&rev=471317
Log:
o adding a couple more properties
o we only ever run this from this machine
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize.properties
maven/archiva/trunk/maven-meeper/src/bin/synchronize.sh
Modified: maven/archiva/trunk/maven-meeper/src/bin/synchronize.properties
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize.properties?view=diff&rev=471317&r1=471316&r2=471317
==============================================================================
--- maven/archiva/trunk/maven-meeper/src/bin/synchronize.properties (original)
+++ maven/archiva/trunk/maven-meeper/src/bin/synchronize.properties Sat Nov 4
17:26:12 2006
@@ -7,3 +7,7 @@
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
Modified: maven/archiva/trunk/maven-meeper/src/bin/synchronize.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize.sh?view=diff&rev=471317&r1=471316&r2=471317
==============================================================================
--- maven/archiva/trunk/maven-meeper/src/bin/synchronize.sh (original)
+++ maven/archiva/trunk/maven-meeper/src/bin/synchronize.sh Sat Nov 4 17:26:12
2006
@@ -72,7 +72,7 @@
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 @@
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 [EMAIL
PROTECTED]:~maven/repository-staging/to-ibiblio/maven/.htaccess
-fi
+cp $M1_M2_REWRITE_RULES $MAVEN1_REPO/.htaccess
scp $M1_M2_REWRITE_RULES [EMAIL PROTECTED]:/public/html/maven/.htaccess