fixup commit scripts for git

4 files changed, 16 insertions, 18 deletions

diff --git a/bin/231add b/bin/231add
index ee9f8a456..c4b5437b4 100755
--- a/bin/231add
+++ b/bin/231add
@@ -9,15 +9,14 @@ my $dir = getcwd;
 ( my $prefix = $dir ) =~ s(^/home/$USER/freeside/?)() or die $dir; #eventually from anywhere
 
 system join('',
-  #"cvs add @ARGV && ",
-  "cvs add @ARGV ; ",
+  "git add @ARGV ; ",
   "( for file in @ARGV; do ",
      "cp -i \$file /home/$USER/freeside2.3/$prefix/`dirname \$file`;",
      "cp -i \$file /home/$USER/freeside2.1/$prefix/`dirname \$file`;",
   "done ) && ",
   "cd /home/$USER/freeside2.3/$prefix/ && ",
-  "cvs add @ARGV",
+  "git add @ARGV; ",
   "cd /home/$USER/freeside2.1/$prefix/ && ",
-  "cvs add @ARGV"
+  "git add @ARGV"
 );
 
diff --git a/bin/231commit b/bin/231commit
index e0470058f..fa031b5d6 100755
--- a/bin/231commit
+++ b/bin/231commit
@@ -18,12 +18,12 @@ die "no files!" unless @ARGV;
 
 #print <<END;
 system join('',
-  "( cd /home/$USER/freeside2.3/$prefix; cvs update @ARGV ) && ",
-  "( cd /home/$USER/freeside2.1/$prefix; cvs update @ARGV ) && ",
-  "cvs diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p0 ) ",
-  " && cvs diff -u @ARGV | ( cd /home/$USER/freeside2.1/$prefix; patch -p0 ) ",
-  " && ( ( cvs commit  -m $desc @ARGV & ); ",
-  "( sleep 1;cd /home/$USER/freeside2.3/$prefix; cvs commit -m $desc @ARGV & ); ",
-  "( sleep 1;cd /home/$USER/freeside2.1/$prefix; cvs commit -m $desc @ARGV & ) )"
+  "( cd /home/$USER/freeside2.3/$prefix; git pull ) && ",
+  "( cd /home/$USER/freeside2.1/$prefix; git pull ) && ",
+  "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p0 ) ",
+  " && git diff -u @ARGV | ( cd /home/$USER/freeside2.1/$prefix; patch -p0 ) ",
+  " && ( ( git commit  -m $desc @ARGV && git push); ",
+  "( cd /home/$USER/freeside2.3/$prefix; git commit -m $desc @ARGV && git push); ",
+  "( cd /home/$USER/freeside2.1/$prefix; git commit -m $desc @ARGV && git push) )"
 );
 
diff --git a/bin/23add b/bin/23add
index 3c99ed8f5..7dc9f1307 100755
--- a/bin/23add
+++ b/bin/23add
@@ -9,12 +9,11 @@ my $dir = getcwd;
 ( my $prefix = $dir ) =~ s(^/home/$USER/freeside/?)() or die $dir; #eventually from anywhere
 
 system join('',
-  #"cvs add @ARGV && ",
-  "cvs add @ARGV ; ",
+  "git add @ARGV ; ",
   "( for file in @ARGV; do ",
      "cp -i \$file /home/$USER/freeside2.3/$prefix/`dirname \$file`;",
   "done ) && ",
   "cd /home/$USER/freeside2.3/$prefix/ && ",
-  "cvs add @ARGV"
+  "git add @ARGV"
 );
 
diff --git a/bin/23commit b/bin/23commit
index e629a60e6..3416925d7 100755
--- a/bin/23commit
+++ b/bin/23commit
@@ -18,9 +18,9 @@ die "no files!" unless @ARGV;
 
 #print <<END;
 system join('',
-  "( cd /home/$USER/freeside2.3/$prefix; cvs update @ARGV ) && ",
-  "cvs diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p0 ) ",
-  " && ( ( cvs commit  -m $desc @ARGV & ); ",
-  "( sleep 1;cd /home/$USER/freeside2.3/$prefix; cvs commit -m $desc @ARGV & ) )"
+  "( cd /home/$USER/freeside2.3/$prefix; git pull ) && ",
+  "git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p0 ) ",
+  " && ( ( git commit  -m $desc @ARGV && git push ); ",
+  "( cd /home/$USER/freeside2.3/$prefix; git commit -m $desc @ARGV && git push ) )"
 );