X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=bak-git-server.pl;h=5e656a0efb416af808dc26d929983846b2241712;hb=4faf28e5b9db5adabd5005cb2655365774001b55;hp=a87473e09c6163d52a146d12336abda940812823;hpb=ef9c331fd70d013510138b040a29b97e67c1630b;p=bak-git.git

diff --git a/bak-git-server.pl b/bak-git-server.pl
index a87473e..5e656a0 100755
--- a/bak-git-server.pl
+++ b/bak-git-server.pl
@@ -26,8 +26,12 @@ bak command overview:
   bak ch[anges]
   bak revert [host:]/path
 
+  bak cat [host:]/path
+
   bak - push all changed files to server
 
+See L<http://blog.rot13.org/bak-git> for more information
+
 =cut
 
 use warnings;
@@ -51,7 +55,8 @@ $server_ip ||= '127.0.0.1';
 
 my $shell_client = <<__SHELL_CLIENT__;
 #!/bin/sh
-echo \$USER/\$SUDO_USER `hostname -s` `pwd` \$* | nc $server_ip 9001
+#echo \$USER/\$SUDO_USER $install `pwd` \$* | nc 127.0.0.1 9001
+echo \$USER/\$SUDO_USER `hostname` `pwd` \$* | nc $server_ip 9001
 __SHELL_CLIENT__
 
 chdir $dir;
@@ -87,6 +92,11 @@ warn "dir: $dir listen: $server_ip:9001\n"
 	, $shell_client
 ;
 
+sub rsync {
+	warn "# rsync ",join(' ', @_), "\n";
+	system 'rsync', @_;
+}
+
 sub pull_changes {
 	my $hostname = shift;
 	system "find $hostname -type f | sed 's,$hostname,,' > /tmp/$hostname.list";
@@ -95,7 +105,7 @@ sub pull_changes {
 		print $files "$_\n" foreach @_;
 		close($files);
 	}
-	system "rsync -avv --files-from /tmp/$hostname.list root\@$hostname:/ $hostname/"
+	rsync split / /, "-avv --files-from /tmp/$hostname.list root\@$hostname:/ $hostname/";
 }
 
 while (my $client = $server->accept()) {
@@ -103,6 +113,7 @@ while (my $client = $server->accept()) {
 	chomp($line);
 	warn "<<< $line\n";
 	my ($user,$hostname,$pwd,$command,$rel_path,$message) = split(/\s+/,$line,6);
+	$hostname =~ s/\..+$//;
 
 	my $on_host = '';
 	if ( $rel_path =~ s/^([^:]+):(.+)$/$2/ ) {
@@ -140,7 +151,7 @@ while (my $client = $server->accept()) {
 	} elsif ( $command eq 'add' ) {
 		mkpath "$hostname/$dir" unless -e "$hostname/$dir";
 		while ( $path ) {
-			system 'rsync', '-avv', "root\@$hostname:$path", "$hostname/$path";
+			rsync( '-avv', "root\@$hostname:$path", "$hostname/$path" );
 			print $client git 'add', "$hostname/$path";
 
 			$args_message =~ s/^(.+)\b// || last;
@@ -157,22 +168,37 @@ while (my $client = $server->accept()) {
 		$command = 'log --patch-with-stat' if $command =~ m/^ch/;
 		pull_changes( $hostname ) if $command eq 'diff';
 		if ( $on_host ) {
-			system 'rsync', '-avv', "root\@$on_host:$path", "$on_host/$path";
+			mkpath $_ foreach grep { ! -e $_ } ( "$hostname/$dir", "$on_host/$dir" );
+			rsync( '-avv', "root\@$hostname:$path", "$hostname/$path" );
+			rsync( '-avv', "root\@$on_host:$path", "$on_host/$path" );
 			open(my $diff, '-|', "diff -Nuw $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);
+			my $backup_path = $path ? "$hostname/$path" : "$hostname/";
+			# hostname must end with / to prevent error from git:
+			# ambiguous argument 'arh-hw': both revision and filename
+			# to support branches named as hosts
+			print $client git($command, $backup_path);
 		}
 	} elsif ( $command eq 'revert' ) {
 		if ( $on_host ) {
-			system 'rsync', '-avv', "$on_host/$path", "root\@$hostname:$path";
+			rsync( '-avv', "$on_host/$path", "root\@$hostname:$path" );
 		} else {
 			print $client git "checkout -- $hostname/$path";
-			system 'rsync', '-avv', "$hostname/$path", "root\@$hostname:$path";
+			rsync( '-avv', "$hostname/$path", "root\@$hostname:$path" );
+		}
+	} elsif ( $command eq 'cat' ) {
+		my $file_path = ( $on_host ? $on_host : $hostname ) . "/$path";
+		open(my $file, '<', $file_path) || warn "ERROR $file_path: $!";
+		while(<$file>) {
+			print $client $_;
 		}
+		close($file);
+	} elsif ( $command eq 'ls' ) {
+		print $client `ls $backup_path`;
 	} else {
 		print $client "Unknown command: $command\n";
 	}