bak add /path
bak commit [/path [message]]
- bak diff [/path]
+ 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
+See L<http://blog.rot13.org/bak-git> for more information
+
=cut
use warnings;
my $shell_client = <<__SHELL_CLIENT__;
#!/bin/sh
-echo \$USER/\$SUDO_USER `hostname -s` `pwd` \$* | nc $server_ip 9001
+echo \$USER/\$SUDO_USER `hostname` `pwd` \$* | nc $server_ip 9001
__SHELL_CLIENT__
chdir $dir;
sub pull_changes {
my $hostname = shift;
system "find $hostname -type f | sed 's,$hostname,,' > /tmp/$hostname.list";
+ if ( @_ ) {
+ open(my $files, '>>', "/tmp/$hostname.list");
+ print $files "$_\n" foreach @_;
+ close($files);
+ }
system "rsync -avv --files-from /tmp/$hostname.list root\@$hostname:/ $hostname/"
}
my $line = <$client>;
chomp($line);
warn "<<< $line\n";
- my ($user,$hostname,$pwd,$command,$rel_path,$message) = split(/\s+/,$line,5);
-
+ my ($user,$hostname,$pwd,$command,$rel_path,$message) = split(/\s+/,$line,6);
+ $hostname =~ s/\..+$//;
+
+ my $on_host = '';
+ if ( $rel_path =~ s/^([^:]+):(.+)$/$2/ ) {
+ if ( -e $1 ) {
+ $on_host = $1;
+ } else {
+ print $client "host $1 doesn't exist in backup\n";
+ next;
+ }
+ }
my $path = $rel_path =~ m{^/} ? $rel_path : "$pwd/$rel_path";
- $message ||= '';
- warn "$hostname [$command] $path | $message\n";
- $message ||= "$hostname [$command] $path";
+ warn "$hostname [$command] $on_host:$path | $message\n";
+
+ my $args_message = $message;
+
+ $message ||= "$path [$command]";
+ $message = "$hostname: $message";
my $dir = $path;
$dir =~ s{/[^/]+$}{};
pull_changes $hostname;
} elsif ( $command eq 'add' ) {
mkpath "$hostname/$dir" unless -e "$hostname/$dir";
- system 'rsync', '-avv', "root\@$hostname:$path", "$hostname/$path";
- print $client git 'add', "$hostname/$path";
+ while ( $path ) {
+ system 'rsync', '-avv', "root\@$hostname:$path", "$hostname/$path";
+ print $client git 'add', "$hostname/$path";
+
+ $args_message =~ s/^(.+)\b// || last;
+ $path = $1;
+ warn "? $path";
+ }
} elsif ( $command eq 'commit' ) {
pull_changes $hostname;
$message =~ s/'/\\'/g;
} 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';
- # commands without path will show host-wide status/changes
- print $client git($command, $rel_path ? $backup_path : $hostname);
+ pull_changes( $hostname ) if $command eq 'diff';
+ if ( $on_host ) {
+ system 'rsync', '-avv', "root\@$hostname:$path", "$hostname/$path";
+ system '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
+ my $backup_path = $rel_path ? $backup_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' ) {
- 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";
}