[freeside-commits] branch master updated. 7e586cc9b014c9772043e39ae001e5bf6f841d35

[Ivan]

The branch, master has been updated
       via  7e586cc9b014c9772043e39ae001e5bf6f841d35 (commit)
       via  9970378e485e86b2c5281aeab4411087c4550bd6 (commit)
      from  4d00bdc38de74723b1f577edec0490fcad747e18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7e586cc9b014c9772043e39ae001e5bf6f841d35
Merge: 9970378 4d00bdc
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat May 11 13:18:52 2013 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 9970378e485e86b2c5281aeab4411087c4550bd6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat May 11 13:18:41 2013 -0700

    updating shitty multi-tree tools

diff --git a/bin/32add b/bin/32add
new file mode 100755
index 0000000..856c2f1
--- /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/3commit b/bin/32commit
similarity index 58%
copy from bin/3commit
copy to bin/32commit
index cd1db21..903722e 100755
--- a/bin/3commit
+++ b/bin/32commit
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# usage: 23commit 'log message' filename filename ...
+# usage: 32commit 'log message' filename filename ...
 
 use Cwd;
 use String::ShellQuote;
@@ -19,8 +19,11 @@ die "no files!" unless @ARGV;
 #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 pull && git commit  -m $desc @ARGV && git push ); ",
-  "( cd /home/$USER/freeside3/$prefix; git commit -m $desc @ARGV && git push ) )"
+  " && 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 cd1db21..37b5000 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;

-----------------------------------------------------------------------

Summary of changes:
 bin/{231add => 32add}     |    6 +++---
 bin/{3commit => 32commit} |    9 ++++++---
 bin/3commit               |    2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
 copy bin/{231add => 32add} (78%)
 copy bin/{3commit => 32commit} (58%)