Replace rsync by cvssuck.

diff --git a/cvs2git-inc.sh b/cvs2git-inc.sh
index 898974c..2fdde39 100755 (executable)
--- a/cvs2git-inc.sh
+++ b/cvs2git-inc.sh
@@ -23,11 +23,13 @@
 # ==== import ====
 
 if [ -z "$NO_RSYNC" ]; then
-       # sync (fetch) files into jra1mw.cvs
-       ./cvssync.sh
+       ## sync (fetch) files into jra1mw.cvs
+       ##./cvssync.sh
+       #
+       ## sync fetched CVS repo to one-module CVS repo
+       #rsync --archive --verbose jra1mw.cvs/ jra1mw-cvssync.cvs/jra1mw/
 
-       # sync fetched CVS repo to one-module CVS repo
-       rsync --archive --verbose jra1mw.cvs/ jra1mw-cvssync.cvs/jra1mw/
+       ./cvssuck.sh
 
        # import!
        [ -d "jra1mw-cvssync.git/.git" ] || (echo "First run! Initial cvs2svn import must be done manually (although 'git cvsimport' will import something too)." && exit 1)
@@ -63,7 +65,7 @@ branch_2_0      385a0a242b5e4666192f1198df92d7d451c79164
 branch_2_1      6ed42184743a87910afc8c720509003301ec6c17
 branch_workflow a0a362418b99167f40d1328ea8a934b147372329
 branch_3_0     a83b40bd71315193486807eee5d89f5c0e052497
-master          2ef3e3661369d1c14713c237b54b62f8f802926b" | while read branch start; do
+master          7d6f9aa03afaf70dfb6685246940348662eca988" | while read branch start; do
        echo "$start..cvssync/$branch"
        git checkout $branch || break
        cl=`git log --format='%ct %H' $start..cvssync/$branch -- | grep -v '\(e6919c\|1f39df\|1f39df\)' | sort -n | cut -f2 -d' '`

diff --git a/cvssuck.sh b/cvssuck.sh
new file mode 100755 (executable)
index 0000000..abb6164
--- /dev/null
+++ b/cvssuck.sh
@@ -0,0 +1,4 @@
+#! /bin/sh
+for module in org.glite.testsuites.ctb/LB org.glite.deployment.jpis org.glite.deployment.jpps org.glite.deployment.lb org.glite.jobid org.glite.jobid.api-c org.glite.jobid.api-cpp org.glite.jobid.api-java org.glite.jp org.glite.jp.client org.glite.jp.common org.glite.jp.doc org.glite.jp.index org.glite.jp.primary org.glite.jp.server-common org.glite.jp.ws-interface org.glite.lb org.glite.lb.client org.glite.lb.client-interface org.glite.lb.client-java org.glite.lb.common org.glite.lb.doc org.glite.lb.glite-LB org.glite.lb.harvester org.glite.lbjp-common org.glite.lbjp-common.db org.glite.lbjp-common.gsoap-plugin org.glite.lbjp-common.gss org.glite.lbjp-common.jp-interface org.glite.lbjp-common.log org.glite.lbjp-common.maildir org.glite.lbjp-common.server-bones org.glite.lbjp-common.trio org.glite.lbjp-utils.db org.glite.lbjp-utils.jobid org.glite.lbjp-utils.maildir org.glite.lbjp-utils.server-bones org.glite.lbjp-utils.trio org.glite.lb.logger org.glite.lb.logger-msg org.glite.lb.proxy org.glite.lb.server org.glite.lb.server-bones org.glite.lb.state-machine org.glite.lb.types org.glite.lb.utils org.glite.lb-utils org.glite.lb-utils.context org.glite.lb-utils.db org.glite.lb-utils.jobid org.glite.lb-utils.server-bones org.glite.lb-utils.trio org.glite.lb.ws-interface org.glite.lb.ws-test org.glite.lb.yaim org.glite.lb.emi-lb org.glite.myproxy-config org.glite.px org.glite.px.glite-PX org.glite.px.myproxy-config org.glite.px.myproxy-yaim org.glite.px.proxyrenewal org.glite.px.emi-px org.glite.security.gsoap-plugin org.glite.security.gss org.glite.security.proxyrenewal org.glite.testsuite.ctb org.glite.yaim.lb org.glite.yaim.myproxy org.gridsite.core; do
+       cvssuck/cvssuck :pserver:anonymous@jra1mw.cvs.cern.ch:/cvs/jra1mw -o jra1mw-cvssync.cvs/jra1mw/$module $module
+done

diff --git a/cvssync.sh b/cvssync.sh
deleted file mode 100755 (executable)
index 716346c..0000000
--- a/cvssync.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-PORT=10022
-RSH="ssh -p $PORT -o StrictHostKeyChecking=no"
-RCVSDIR=/net/jra1mw.cvs.cern.ch/local/projects/jra1mw/rep
-
-. $HOME/ssh-agent-info.sh
-ssh -f lxplus.cern.ch -L $PORT:lxcvsfs5.cern.ch:22 'echo "logged in"; while true; do sleep 1; done'&
-sshpid=$!
-echo "Press ENTER after logging in..."
-read
-
-mkdir -p jra1mw.cvs >/dev/null || true
-cd jra1mw.cvs
-$RSH localhost "cd $RCVSDIR; ls -1 | grep ^org."
-rsync --rsh="$RSH" --archive --verbose --exclude=/CVSROOT/JAVA_TOOLS/\*\*\* --exclude=/CVSROOT/history --exclude=/CVSROOT/\*,v --include-from=../filter.txt --exclude=\*\* localhost:$RCVSDIR/ . 2>&1 | tee ../sync.log
-rm -rf org.glite.px.myproxy-config/org.glite.security.voms-api/.git
-rm -rf org.glite.px.myproxy-config/org.glite.security.voms-api-cpp/.git
-cd -
-
-pids="$sshpid `ps xafw | grep 'ssh -f lxplus.cern.ch' | sed 's/^ *//' | cut -f 1 -d' ' | tr '\n' ' '`"
-kill $pids 2>/dev/null
-sleep 1
-kill -9 $pids 2>/dev/null