svn commit: r261587 - user/uqs/git_conv

[Ulrich Spoerlein]

Author: uqs
Date: Fri Feb  7 13:12:54 2014
New Revision: 261587
URL: http://svnweb.freebsd.org/changeset/base/261587

Log:
  Allow to run the three conversions on different schedules and not
  all in one go always.

Modified:
  user/uqs/git_conv/git_conv
  user/uqs/git_conv/git_conv_cron

Modified: user/uqs/git_conv/git_conv
==============================================================================
--- user/uqs/git_conv/git_conv	Fri Feb  7 13:06:48 2014	(r261586)
+++ user/uqs/git_conv/git_conv	Fri Feb  7 13:12:54 2014	(r261587)
@@ -32,10 +32,26 @@
 : ${DOC_REPO=/home/svn/doc}
 : ${PORTS_REPO=/home/svn/ports}
 
-LOCK=/tmp/gitconv.lock
-trap 'rm -f ${LOCK} ; exit 1' 1 2 3 15
-if ! shlock -p $$ -f ${LOCK}; then
-    echo "Locked by `cat ${LOCK}`, running too long? Please fix ..." >&2
+case "$1" in
+    base)
+	;;
+    ports)
+	;;
+    doc)
+	;;
+    *)
+	echo "Need to specify which repo to convert" >&2
+	exit 1
+	;;
+esac
+
+TYPE=$1
+
+LOCK="/tmp/gitconv_${TYPE}.lock"
+trap 'rm -f "${LOCK}" ; exit 1' 1 2 3 15
+if ! shlock -p $$ -f "${LOCK}"; then
+    echo >&2
+    echo "Locked by ${TYPE} (`cat "${LOCK}"`), running too long? Please fix ..." >&2
     exit 1
 fi
 
@@ -97,10 +113,26 @@ gitsvn()
     done
 }
 
-gitsvn src-head.git github
-gitsvn doc-head.git github
-gitsvn ports-head.git github
-
-svn2git $RULES_DIR/freebsd-base.rules ${SRC_REPO} github bitbucket googlecode
-svn2git $RULES_DIR/freebsd-doc.rules ${DOC_REPO} github
-svn2git $RULES_DIR/freebsd-ports.rules ${PORTS_REPO} github
+case "$TYPE" in
+    base)
+	gitsvn src-head.git github
+	;;
+    doc)
+	gitsvn doc-head.git github
+	;;
+    ports)
+	gitsvn ports-head.git github
+	;;
+esac
+
+case "$TYPE" in
+    base)
+	svn2git $RULES_DIR/freebsd-base.rules ${SRC_REPO} github bitbucket googlecode
+	;;
+    doc)
+	svn2git $RULES_DIR/freebsd-doc.rules ${DOC_REPO} github
+	;;
+    ports)
+	svn2git $RULES_DIR/freebsd-ports.rules ${PORTS_REPO} github
+	;;
+esac

Modified: user/uqs/git_conv/git_conv_cron
==============================================================================
--- user/uqs/git_conv/git_conv_cron	Fri Feb  7 13:06:48 2014	(r261586)
+++ user/uqs/git_conv/git_conv_cron	Fri Feb  7 13:12:54 2014	(r261587)
@@ -1,17 +1,30 @@
 #!/bin/sh
 
-today="`date +%Y-%m-%d`"
-log="$today.log"
+case "$1" in
+    base)
+	;;
+    ports)
+	;;
+    doc)
+	;;
+    *)
+	echo "Need to specify which repo to convert" >&2
+	exit 1
+	;;
+esac
+
+TYPE=$1
+LOG="`date +%Y-%m-%d`_${TYPE}.log"
 
 cd /home/git
 
 # TODO cleanup old logs
 
-./git_conv >> $log 2>&1
+./git_conv "$@" >> $LOG 2>&1
 
 if [ $? != 0 ]; then
     echo "Error during git_conv" >&2
-    tail -30 $log
+    tail -30 $LOG
     exit 1
 fi