updating shitty multi-tree tools

3 files changed, 52 insertions, 1 deletions

diff --git a/bin/32add b/bin/32add
new file mode 100755
index 000000000..856c2f133
--- /dev/null
+++ b/bin/32add
@@ -0,0 +1,22 @@
+#!/usr/bin/perl
+
+use Cwd;
+use String::ShellQuote;
+
+my $USER = $ENV{USER};
+
+my $dir = getcwd;
+( my $prefix = $dir ) =~ s(^/home/$USER/freeside/?)() or die $dir; #eventually from anywhere
+
+system join('',
+  "git add @ARGV ; ",
+  "( for file in @ARGV; do ",
+     "cp -i \$file /home/$USER/freeside3/$prefix/`dirname \$file`;",
+     "cp -i \$file /home/$USER/freeside2.3/$prefix/`dirname \$file`;",
+  "done ) && ",
+  "cd /home/$USER/freeside3/$prefix/ && ",
+  "git add @ARGV; ",
+  "cd /home/$USER/freeside2.3/$prefix/ && ",
+  "git add @ARGV"
+);
+
diff --git a/bin/32commit b/bin/32commit
new file mode 100755
index 000000000..903722e4e
--- /dev/null
+++ b/bin/32commit
@@ -0,0 +1,29 @@
+#!/usr/bin/perl
+
+# usage: 32commit 'log message' filename filename ...
+
+use Cwd;
+use String::ShellQuote;
+
+my $USER = $ENV{USER};
+
+my $dir = getcwd;
+( my $prefix = $dir ) =~ s(^/home/$USER/freeside/?)() or die $dir; #eventually from anywhere
+
+my $desc = shell_quote(shift @ARGV); # -m
+
+die "no files!" unless @ARGV;
+
+#warn "$prefix";
+
+#print <<END;
+system join('',
+  "( cd /home/$USER/freeside3/$prefix; git pull ) && ",
+  "( cd /home/$USER/freeside2.3/$prefix; git pull ) && ",
+  "git diff -u @ARGV | ( cd /home/$USER/freeside3/$prefix; patch -p1 ) ",
+  " && git diff -u @ARGV | ( cd /home/$USER/freeside2.3/$prefix; patch -p1 ) ",
+  " && ( ( git pull && git commit  -m $desc @ARGV && git push); ",
+  "( cd /home/$USER/freeside3/$prefix; git commit -m $desc @ARGV && git push); ",
+  "( cd /home/$USER/freeside2.3/$prefix; git commit -m $desc @ARGV && git push) )"
+);
+
diff --git a/bin/3commit b/bin/3commit
index cd1db2174..37b500063 100755
--- a/bin/3commit
+++ b/bin/3commit
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# usage: 23commit 'log message' filename filename ...
+# usage: 3commit 'log message' filename filename ...
 
 use Cwd;
 use String::ShellQuote;