Author: gmcdonald
Date: Thu Nov 25 06:12:34 2010
New Revision: 1038931
URL: http://svn.apache.org/viewvc?rev=1038931&view=rev
Log:
Change config files to suit new Jails layout
Modified:
forrest/zone/config/run-forrestbot.sh
forrest/zone/config/setenv-java-14.sh
forrest/zone/config/setenv-java-15.sh
forrest/zone/config/setenv.sh
forrest/zone/config/update-forrest-trunk.sh
forrest/zone/config/update_check.sh
Modified: forrest/zone/config/run-forrestbot.sh
URL:
http://svn.apache.org/viewvc/forrest/zone/config/run-forrestbot.sh?rev=1038931&r1=1038930&r2=1038931&view=diff
==============================================================================
--- forrest/zone/config/run-forrestbot.sh (original)
+++ forrest/zone/config/run-forrestbot.sh Thu Nov 25 06:12:34 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -47,11 +47,11 @@ END
;;
esac
-export CONFIG=/export/home/config
+export CONFIG=/home/forrest/config
source ${CONFIG}/setenv.sh
source ${CONFIG}/setenv-java-15.sh
-export FORREST_HOME=/export/opt/forrest-$fbVersion
+export FORREST_HOME=/home/forrest/sources/forrest-$fbVersion
export FORRESTBOT_HOME=${CONFIG}/forrestbot-$fbVersion
export PATH=${PATH}:${FORREST_HOME}/bin
umask 0002
Modified: forrest/zone/config/setenv-java-14.sh
URL:
http://svn.apache.org/viewvc/forrest/zone/config/setenv-java-14.sh?rev=1038931&r1=1038930&r2=1038931&view=diff
==============================================================================
--- forrest/zone/config/setenv-java-14.sh (original)
+++ forrest/zone/config/setenv-java-14.sh Thu Nov 25 06:12:34 2010
@@ -17,6 +17,6 @@
# Java 1.4.2_06
-export JAVA_HOME=/usr/j2se
+# export JAVA_HOME=/usr/j2se
-export PATH=${JAVA_HOME}/bin:${PATH}
+# export PATH=${JAVA_HOME}/bin:${PATH}
Modified: forrest/zone/config/setenv-java-15.sh
URL:
http://svn.apache.org/viewvc/forrest/zone/config/setenv-java-15.sh?rev=1038931&r1=1038930&r2=1038931&view=diff
==============================================================================
--- forrest/zone/config/setenv-java-15.sh (original)
+++ forrest/zone/config/setenv-java-15.sh Thu Nov 25 06:12:34 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -17,6 +17,6 @@
# Java 1.5
-export JAVA_HOME=/usr/java
+export JAVA_HOME=/usr/local
export PATH=${JAVA_HOME}/bin:${PATH}
Modified: forrest/zone/config/setenv.sh
URL:
http://svn.apache.org/viewvc/forrest/zone/config/setenv.sh?rev=1038931&r1=1038930&r2=1038931&view=diff
==============================================================================
--- forrest/zone/config/setenv.sh (original)
+++ forrest/zone/config/setenv.sh Thu Nov 25 06:12:34 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,9 +16,9 @@
# limitations under the License.
-export SHELL=/usr/bin/bash
-export DOC_ROOT=/var/apache2/htdocs
-export CONFIG=/export/home/config
+export SHELL=/bin/bash
+export DOC_ROOT=/usr/local/www/apache22/data
+export CONFIG=/home/forrest/config
export LANG=en_US.UTF-8
-export
PATH=/usr/sbin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/usr/X/bin:/usr/ucb:/usr/ccs/bin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/opt/subversion-current/bin
+# export
PATH=/usr/sbin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/usr/X/bin:/usr/ucb:/usr/ccs/bin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/opt/subversion-current/bin
Modified: forrest/zone/config/update-forrest-trunk.sh
URL:
http://svn.apache.org/viewvc/forrest/zone/config/update-forrest-trunk.sh?rev=1038931&r1=1038930&r2=1038931&view=diff
==============================================================================
--- forrest/zone/config/update-forrest-trunk.sh (original)
+++ forrest/zone/config/update-forrest-trunk.sh Thu Nov 25 06:12:34 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -18,16 +18,16 @@
# FIXME: Need better error handling if SVN fails or if build fails.
-source /export/home/config/setenv.sh
-source /export/home/config/setenv-java-15.sh
+source /home/forrest/config/setenv.sh
+source /home/forrest/config/setenv-java-15.sh
umask 0002
-export FORREST_HOME=/export/opt/forrest-trunk
+export FORREST_HOME=/home/forrest/sources/forrest-trunk
logfn=`date "+update-forrest-trunk-%Y%m%d%H.log"`
logfile=${CONFIG}/$logfn
sender=d...@forrest.apache.org
-#recipient=crossl...@apache.org #TEST
-recipient=$sender
+recipient=gmcdona...@apache.org
+#recipient=$sender
function sendMsg {
cat | mail $recipient <<EOF
@@ -48,7 +48,7 @@ uptime >> $logfile
echo >> $logfile
echo "Do svn update ..." >> $logfile
-cd /export/opt/forrest-trunk
+cd /home/forrest/sources/forrest-trunk
svn update >> $logfile 2>&1
statusUpdate=$?
echo "statusUpdate=$statusUpdate" >> $logfile
Modified: forrest/zone/config/update_check.sh
URL:
http://svn.apache.org/viewvc/forrest/zone/config/update_check.sh?rev=1038931&r1=1038930&r2=1038931&view=diff
==============================================================================
--- forrest/zone/config/update_check.sh (original)
+++ forrest/zone/config/update_check.sh Thu Nov 25 06:12:34 2010
@@ -1,7 +1,7 @@
#!/bin/sh
-/opt/subversion-current/bin/svn st -u /export/opt/forrest-trunk | grep '\*' >
/dev/null
+svn st -u /home/forrest/sources/forrest-trunk | grep '\*' > /dev/null
if [ $? = 0 ]; then
- /export/home/config/update-forrest-trunk.sh
+ /home/forrest/config/update-forrest-trunk.sh
fi
