From 0bc03570aed1d6dd07fe3f6334b071ca136d6376 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 12 Dec 2018 17:06:57 +0100 Subject: [PATCH] fixes from review --- src/include/installation/inst_inc_first.rb | 7 ++----- src/lib/installation/clients/inst_finish.rb | 4 +++- src/lib/installation/clients/inst_save_hardware_status.rb | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/include/installation/inst_inc_first.rb b/src/include/installation/inst_inc_first.rb index 24bf3172c..ec547f824 100644 --- a/src/include/installation/inst_inc_first.rb +++ b/src/include/installation/inst_inc_first.rb @@ -146,11 +146,8 @@ def InitFirstStageInstallationSystem "Directory '%1' exists, removing...", String.Quote(zypp_data_item) ) - bashcmd = "/usr/bin/rm -rf #{zypp_data_item.shellescape}" - Builtins.y2milestone( - "Result: %1", - WFM.Execute(path(".local.bash_output"), bashcmd) - ) + result = WFM.Execute(path(".local.bash_output"), "/usr/bin/rm -rf #{zypp_data_item.shellescape}") + Builtins.y2milestone("Result: #{result.inspect}") end end diff --git a/src/lib/installation/clients/inst_finish.rb b/src/lib/installation/clients/inst_finish.rb index 57262123b..c3a1e0525 100644 --- a/src/lib/installation/clients/inst_finish.rb +++ b/src/lib/installation/clients/inst_finish.rb @@ -21,6 +21,8 @@ require "installation/minimal_installation" +require "shellwords" + Yast.import "UI" Yast.import "Pkg" @@ -161,7 +163,7 @@ def handle_kexec # run new kernel via kexec instead of reboot # command for reading kernel_params - cmd = "/usr/bin/ls '#{String.Quote(Directory.vardir)}/kexec_done' | /usr/bin/tr -d '\n'" + cmd = "/usr/bin/ls #{Directory.vardir.shellescape}/kexec_done | /usr/bin/tr -d '\n'" log.info "Checking flag of successful loading kernel via command #{cmd}" out = WFM.Execute(path(".local.bash_output"), cmd) diff --git a/src/lib/installation/clients/inst_save_hardware_status.rb b/src/lib/installation/clients/inst_save_hardware_status.rb index a4146eb9b..831132bbb 100644 --- a/src/lib/installation/clients/inst_save_hardware_status.rb +++ b/src/lib/installation/clients/inst_save_hardware_status.rb @@ -39,7 +39,7 @@ def main @out = SCR.Execute( path(".target.bash_output"), "/usr/sbin/hwinfo --pci --block --mouse --keyboard --isdn --save-config=all\n" \ - "[ -d /var/lib/hardware/udi/org/freedesktop/Hal/devices ] && /usr/bin/perl -pi -e \"s/hwinfo.configured = 'new'/hwinfo.configured = 'no'/\" /var/lib/hardware/udi/org/freedesktop/Hal/devices/*" + "/usr/bin/test -d /var/lib/hardware/udi/org/freedesktop/Hal/devices && /usr/bin/perl -pi -e \"s/hwinfo.configured = 'new'/hwinfo.configured = 'no'/\" /var/lib/hardware/udi/org/freedesktop/Hal/devices/*" ) Builtins.y2milestone("Result: %1", @out)