diff options
author | Steve Kemp <steve@steve.org.uk> | 2015-06-03 14:56:50 +0100 |
---|---|---|
committer | Steve Kemp <steve@steve.org.uk> | 2015-06-03 14:56:50 +0100 |
commit | fb24c99820c74964d71790387d0f7fe93dca073a (patch) | |
tree | ff4f9c39f321228a03cc81b7fe9e68b9b098f0fe /byteback-setup-client | |
parent | 963ad5f8b1773881ab1f5a51702a99e931626786 (diff) |
Reformatted.
This involved reformatting the code to remove TAB characters,
changing " -> ', & etc.
Diffstat (limited to 'byteback-setup-client')
-rwxr-xr-x | byteback-setup-client | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/byteback-setup-client b/byteback-setup-client index 2c00e6a..d8ffbfa 100755 --- a/byteback-setup-client +++ b/byteback-setup-client @@ -3,8 +3,7 @@ # Run on a client machine to set up backups for the first time # - -$LOAD_PATH.unshift("/usr/lib/byteback") +$LOAD_PATH.unshift('/usr/lib/byteback') require 'fileutils' require 'trollop' @@ -14,60 +13,58 @@ include Byteback::Util include Byteback::Log def error(message) - STDERR.print "*** #{message}\n" - exit 1 + STDERR.print "*** #{message}\n" + exit 1 end def verbose(message) - print "#{message}\n" + print "#{message}\n" end -opts = Trollop::options do - - opt :hostname, "Set host name for backups", - :type => :string - - opt :destination, "Backup destination (i.e. user@host:/path)", - :type => :string +opts = Trollop.options do + opt :hostname, 'Set host name for backups', + type: :string + opt :destination, 'Backup destination (i.e. user@host:/path)', + type: :string end @destination = opts[:destination] @hostname = opts[:hostname] _dummy, @destination_user, @destination_host, colon, @destination_path = - /^(.*)?(?:@)([^:]+)(:)(.*)?$/.match(@destination).to_a + /^(.*)?(?:@)([^:]+)(:)(.*)?$/.match(@destination).to_a @destination_user ||= 'byteback' @destination_path ||= '' @destination_host ||= @destination -if !@hostname - @hostname = `hostname -f`.chomp - warn "No hostname set, using #{@hostname}\n" +unless @hostname + @hostname = `hostname -f`.chomp + warn "No hostname set, using #{@hostname}\n" end -FileUtils.mkdir_p("/etc/byteback") +FileUtils.mkdir_p('/etc/byteback') -if File.readable?("/etc/byteback/key") - warn "Skipping key generation, delete /etc/byteback/key if that's wrong" +if File.readable?('/etc/byteback/key') + warn "Skipping key generation, delete /etc/byteback/key if that's wrong" else - error "Couldn't generate SSH key" unless - system <<-KEYGEN - ssh-keygen -q -t rsa -C "byteback client key" \ - -N "" -f /etc/byteback/key - KEYGEN + error "Couldn't generate SSH key" unless + system <<-KEYGEN + ssh-keygen -q -t rsa -C "byteback client key" \ + -N "" -f /etc/byteback/key + KEYGEN end -key_pub = File.read("/etc/byteback/key.pub").chomp +key_pub = File.read('/etc/byteback/key.pub').chomp error "Remote setup didn't work" unless system("ssh -i /etc/byteback/key -l #{@destination_user} #{@destination_host} byteback-setup-client-receive #{@hostname} #{key_pub}") -File.open("/etc/byteback/destination", "w") do |f| - f.print "#{@destination_user}@#{@destination_host}:#{@destination_path}" +File.open('/etc/byteback/destination', 'w') do |f| + f.print "#{@destination_user}@#{@destination_host}:#{@destination_path}" end print "Setup worked! To take your first backup run: byteback-backup --verbose\n" |