Changeset 10091 in genesis

Timestamp:

Mar 10, 2012, 2:40:14 PM (13 years ago)

Author:

rick

Message:

Working copies at server, now with new python stuff.

Location:

tools/svn-hook

Files:

• genesis-check.sh (modified) (4 diffs)
• pre-commit (modified) (1 diff)

tools/svn-hook/genesis-check.sh

@@ -1 +1 @@
 #!/bin/sh
 #
-# $Id$
 # Check for valid genesis syntax
 # Rick van der Zwet, 2009
@@ -8 +7 @@
 
 TMPDIR=`mktemp -d -t $(basename $0 .sh)`
+
+# Clean up
+trap "rm -R $TMPDIR; exit 0" 0
+trap "rm -R $TMPDIR; exit 1" 1 2 15
+
 # External definition used for debugging
 SVNLOOK="${SVNLOOK:-/usr/local/bin/svnlook --transaction $TXN}"
-GENESISDIR='node-config/genesis/nodes'
+GENESISDIR='node-config/genesis'
 
 # Check whether we need to check something first
@@ -20 +24 @@
 echo "Checking genesis config, please hold your horses..." 1>&2
 for ENTRY in `$SVNLOOK tree --full-paths $REPOS $GENESISDIR`; do
+  echo $ENTRY | grep -q 'retired' && continue
+
   echo $ENTRY | grep -q '/$'
   if [ $? -eq 0 ]; then
@@ -29 +35 @@
 
 # Do actual checking
-sh $TMPDIR/$GENESISDIR/before-commit.sh 2>> $TMPDIR/log.txt 1>>$TMPDIR/log.txt
+echo $TMPDIR/$GENESISDIR/tools/before-commit.sh 1>&2
+sh $TMPDIR/$GENESISDIR/tools/before-commit.sh 2>> $TMPDIR/log.txt 1>>$TMPDIR/log.txt
 RETVAL=$?
 
 sed "s+$TMPDIR/node-config/genesis/nodes/++g" $TMPDIR/log.txt 1>&2
 
-# Clean up
-rm -R $TMPDIR
-
 exit $RETVAL

tools/svn-hook/pre-commit

@@ -1 +1 @@
 #!/bin/sh
-# $Id$
+#
+REPOS="$1"
+TXN="$2"
 BASEDIR=`dirname $0`
 
-REPOS="$1"
-TXN="$2"
+export PATH=$PATH:/usr/local/bin
+export PYTHON_EGG_CACHE="/tmp/eggs"
 
-$BASEDIR/genesis-check.sh $REPOS $TXN || exit 1
+$BASEDIR/genesis-check.sh $REPOS $TXN 2>&1
+exit $?
 
-# All checks passed, so allow the commit.
-exit 0