Merge branch '12-fix-btrfs-path' into 'master'

"byteback-server fails to work with backported btrfs-{tools progs}"

Closes #12

See merge request !4

3 files changed, 3 insertions, 3 deletions

diff --git a/bin/byteback-prune b/bin/byteback-prune
index a91d003..a0cd0fb 100755
--- a/bin/byteback-prune
+++ b/bin/byteback-prune
@@ -147,4 +147,4 @@ if snapshots.empty?
 end
 
 info("Deleting #{snapshots.last.path}")
-log_system("/sbin/btrfs subvolume delete #{snapshots.last.path}")
+log_system("#{btrfs_bin} subvolume delete #{snapshots.last.path}")
diff --git a/bin/byteback-restore b/bin/byteback-restore
index 94babf8..2cd54c5 100755
--- a/bin/byteback-restore
+++ b/bin/byteback-restore
@@ -81,7 +81,7 @@ def restore_files(paths, snapshot, all)
   end
 
   args << "."
-  puts args.join(" " ) if @verbose
+  puts args.join(" ") if @verbose
   system(*args)
 end
 
diff --git a/bin/byteback-setup-client-receive b/bin/byteback-setup-client-receive
index 3673b6a..528ccc9 100755
--- a/bin/byteback-setup-client-receive
+++ b/bin/byteback-setup-client-receive
@@ -32,7 +32,7 @@ Dir.chdir(ENV['HOME']) # don't know why we wouldn't be here
 FileUtils.mkdir_p(@hostname)
 
 error("Couldn't create btrfs subvolume") unless
-  system("/sbin/btrfs subvolume create #{@hostname}/current")
+  system("#{btrfs_bin} subvolume create #{@hostname}/current")
 
 FileUtils.mkdir_p('.ssh')