fabian/docker-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small improvements in the handling of external commands.

Browse Source
This commit is contained in:
Fabian Schlenz 2017-09-25 09:26:58 +02:00
parent 7a1c8e5417
commit 7a83662485
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dup.rb
View File

@ -92,7 +92,7 @@ end
def run(cmd, ignore_returnvalue=false) def run(cmd, ignore_returnvalue=false)
puts "+ #{cmd}" puts "+ #{cmd}"
returnvalue = $dry_run ? true : system(cmd) returnvalue = $dry_run ? true : system("bash -c #{cmd.shellescape}")
raise "Command returned a non-zero exit value." if returnvalue!=true && !ignore_returnvalue raise "Command returned a non-zero exit value." if returnvalue!=true && !ignore_returnvalue
end end
@ -147,7 +147,7 @@ def action_run(container, file)
if data[yml_name].is_a?(Array) if data[yml_name].is_a?(Array)
data[yml_name].each {|val| cmd << cmd_name << esc(val, options[:escape])} data[yml_name].each {|val| cmd << cmd_name << esc(val, options[:escape])}
elsif data[yml_name].is_a?(Hash) elsif data[yml_name].is_a?(Hash)
data[yml_name].each {|key, val| cmd << cmd_name << "#{esc(key, options[:escape])}=#{esc(val, options[:escape])}"} data[yml_name].each {|key, val| cmd << cmd_name << "#{esc(key, options[:escape])}=\"#{esc(val, options[:escape])}\""}
else else
cmd << cmd_name << esc(data[yml_name], options[:escape]) cmd << cmd_name << esc(data[yml_name], options[:escape])
end end