fixes from review

yast · Dec 12, 2018 · 0bc0357 · 0bc0357
1 parent c43fc98
commit 0bc0357
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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)