summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2016-11-09 09:30:12 +0000
committerPatrick J Cherry <patrick@bytemark.co.uk>2016-11-09 09:37:37 +0000
commit25f3947c16b57a9686500534e44423aab90b0bc7 (patch)
treef4c506e8f1e92db72c37b7c0794899d7bf4acb52 /bin
parented5ed3688a035f0caaea5a4fd3915e18a3576d78 (diff)
First pass at fixing btrfs path
This replaces the call to /sbin/btrfs with a method to find a btrfs program, which raises ENOENT if one cannot be found.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/byteback-prune2
-rwxr-xr-xbin/byteback-restore2
-rwxr-xr-xbin/byteback-setup-client-receive2
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')