fix parsing of arguments (6 of them, not 5!)

[bak-git.git] / bak-git-server.pl

diff --git a/bak-git-server.pl b/bak-git-server.pl
index 8343d7a..d6cf7b0 100755 (executable)
--- a/bak-git-server.pl
+++ b/bak-git-server.pl
@@ -19,12 +19,12 @@ bak command overview:
 
   bak add /path
   bak commit [/path [message]]
-  bak diff
-  bak status
-  bak log
+  bak diff [host:][/path]
+  bak status [/path]
+  bak log [/path]
 
   bak ch[anges]
-  bak revert /path
+  bak revert [host:]/path
 
   bak - push all changed files to server
 
@@ -46,12 +46,12 @@ GetOptions(
 ) || die "$!\n";
 
 my ( $dir, $server_ip ) = @ARGV;
-die "usage: $0 /backup/directory\n" unless $dir;
+die "usage: $0 /backup/directory 127.0.0.1\n" unless $dir;
 $server_ip ||= '127.0.0.1';
 
 my $shell_client = <<__SHELL_CLIENT__;
 #!/bin/sh
-echo `hostname -s` `pwd` \$* | nc $server_ip 9001
+echo \$USER/\$SUDO_USER `hostname -s` `pwd` \$* | nc $server_ip 9001
 __SHELL_CLIENT__
 
 chdir $dir;
@@ -95,9 +95,11 @@ sub pull_changes {
 
 while (my $client = $server->accept()) {
        my $line = <$client>;
+       chomp($line);
        warn "<<< $line\n";
-       my ($hostname,$pwd,$command,$rel_path,$message) = split(/\s+/,$line,5);
+       my ($user,$hostname,$pwd,$command,$rel_path,$message) = split(/\s+/,$line,6);
 
+       my $on_host = $1 if $rel_path =~ s/^([^:]+):(.+)$/$2/ && -e $1;
        my $path = $rel_path =~ m{^/} ? $rel_path : "$pwd/$rel_path";
 
        $message ||= '';
@@ -107,6 +109,8 @@ while (my $client = $server->accept()) {
        my $dir = $path;
        $dir =~ s{/[^/]+$}{};
 
+       my $backup_path = -e "$hostname/$path" ? "$hostname/$path" : $hostname;
+
        sub git {
                my $args = join(' ',@_);
                warn "# git $args\n";
@@ -123,17 +127,30 @@ while (my $client = $server->accept()) {
                print $client git 'add', "$hostname/$path";
        } elsif ( $command eq 'commit' ) {
                pull_changes $hostname;
-               print $client git( 'commit', '-m', $message,
-                       ( -e "$hostname/$path" ? "$hostname/$path" : $hostname )
-               );
+               $message =~ s/'/\\'/g;
+               $user =~ s/\/$//;
+               print $client git( "commit -m '$message' --author '$user <$hostname>' $backup_path" );
        } elsif ( $command =~ m{(diff|status|log|ch)} ) {
                $command .= ' --stat' if $command eq 'log';
                $command = 'log --patch-with-stat' if $command =~ m/^ch/;
                pull_changes $hostname if $command eq 'diff';
-               print $client git($command,$hostname);
+               if ( $on_host ) {
+                       system 'rsync', '-avv', "root\@$on_host:$path", "$on_host/$path";
+                       open(my $diff, '-|', "diff -uw $hostname$path $on_host$path");
+                       while(<$diff>) {
+                               print $client $_;
+                       }
+               } else {
+                       # commands without path will show host-wide status/changes
+                       print $client git($command, $rel_path ? $backup_path : $hostname);
+               }
        } elsif ( $command eq 'revert' ) {
-               print $client git "checkout -- $hostname/$path";
-               system 'rsync', '-avv', "$hostname/$path", "root\@$hostname:$path";
+               if ( $on_host ) {
+                       system 'rsync', '-avv', "$on_host/$path", "root\@$hostname:$path";
+               } else {
+                       print $client git "checkout -- $hostname/$path";
+                       system 'rsync', '-avv', "$hostname/$path", "root\@$hostname:$path";
+               }
        } else {
                print $client "Unknown command: $command\n";
        }