From 6e2550943cc9766683b240c05f8d62fe66035449 Mon Sep 17 00:00:00 2001 From: Mark Gilbert <50398495+MarkProminic@users.noreply.github.com> Date: Tue, 17 Jan 2023 12:00:34 -0600 Subject: [PATCH] fix: rubocop literal as condition --- lib/vagrant-zones/action/package.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/vagrant-zones/action/package.rb b/lib/vagrant-zones/action/package.rb index 4d19447..496a01c 100644 --- a/lib/vagrant-zones/action/package.rb +++ b/lib/vagrant-zones/action/package.rb @@ -40,8 +40,7 @@ def call(env) Dir.mkdir(tmp_dir) datasetpath = "#{@machine.provider_config.boot['array']}/#{@machine.provider_config.boot['dataset']}/#{name}" t = Time.new - c = ':' - datetime = %(#{t.year}-#{t.month}-#{t.day}-#{t.hour}#{c}#{t.min}#{c}#{t.sec}) + datetime = %(#{t.year}-#{t.month}-#{t.day}-#{t.hour}:#{t.min}:#{t.sec}) snapshot_create(datasetpath, datetime, env[:ui], @machine.provider_config) snapshot_send(datasetpath, "#{tmp_dir}/box.zss", datetime, env[:ui], @machine.provider_config) ## snapshot_delete(datasetpath, env[:ui], datetime) @@ -125,8 +124,9 @@ def vagrantfile_content(brand, _kernel, datasetpath) end def assemble_box(boxname, extra) - `tar -cvzf #{boxname} ./metadata.json ./Vagrantfile ./box.zss #{extra}` if `bash -c '[[ "$(uname -a)" =~ "Linux" ]]'` - `tar -cvzEf #{boxname} ./metadata.json ./Vagrantfile ./box.zss #{extra}` unless `bash -c '[[ "$(uname -a)" =~ "Linux" ]]'` + is_linux = `bash -c '[[ "$(uname -a)" =~ "Linux" ]]'` + `tar -cvzf #{boxname} ./metadata.json ./Vagrantfile ./box.zss #{extra}` if is_linux + `tar -cvzEf #{boxname} ./metadata.json ./Vagrantfile ./box.zss #{extra}` unless is_linux end end end