Skip to content

Commit

Permalink
make rubocop happy
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Dec 14, 2018
1 parent b8e3f09 commit 3a34ef1
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/clients/inst_kickoff.rb
Expand Up @@ -275,7 +275,8 @@ def backup_stuff

if SCR.Execute(
path(".target.bash"),
"cd #{Installation.destdir.shellescape}; /bin/tar czf .#{filename.shellescape} etc/sysconfig"
"cd #{Installation.destdir.shellescape}; " \
"/bin/tar czf .#{filename.shellescape} etc/sysconfig"
).nonzero?
Builtins.y2error(
"backup of %1 to %2 failed",
Expand Down
3 changes: 2 additions & 1 deletion src/modules/AddOnProduct.rb
Expand Up @@ -240,7 +240,8 @@ def GetCachedFileFromSource(src_id, media, filename, sod, optional)
# Where the file is finally cached
cached_file = Builtins.sformat("%1%2", @filecachedir, @filecachecounter)

cmd = "/usr/bin/mkdir -p #{@filecachedir.shellescape}; /usr/bin/cp #{provided_file.shellescape} #{cached_file.shellescape}"
cmd = "/usr/bin/mkdir -p #{@filecachedir.shellescape}; " \
"/usr/bin/cp #{provided_file.shellescape} #{cached_file.shellescape}"
cmd_run = Convert.to_map(SCR.Execute(path(".target.bash_output"), cmd))

# Unable to cache a file, the original file will be returned
Expand Down
6 changes: 4 additions & 2 deletions src/modules/ProductLicense.rb
Expand Up @@ -1212,7 +1212,8 @@ def UnpackLicenseTgzFileToDirectory(unpack_file, to_directory)
out = SCR.Execute(
path(".target.bash_output"),
Builtins.sformat(
"\n/usr/bin/rm -rf %1 && /usr/bin/mkdir -p %1 && cd %1 && /usr/bin/tar -xzf #{unpack_file.shellescape}\n",
"\n/usr/bin/rm -rf %1 && /usr/bin/mkdir -p %1 && cd %1 && " \
"/usr/bin/tar -xzf #{unpack_file.shellescape}\n",
to_directory.shellescape
)
)
Expand Down Expand Up @@ -1397,7 +1398,8 @@ def SearchForLicense_AddOnProduct(src_id, _fallback_dir)
SCR.Execute(
path(".target.bash_output"),
Builtins.sformat(
"\n/usr/bin/rm -rf %1 && /usr/bin/mkdir -p %1 && cd %1 && /usr/bin/unzip -qqo #{license_file.shellescape}\n",
"\n/usr/bin/rm -rf %1 && /usr/bin/mkdir -p %1 && cd %1 && " \
"/usr/bin/unzip -qqo #{license_file.shellescape}\n",
@tmpdir.shellescape
)
)
Expand Down
3 changes: 2 additions & 1 deletion src/modules/SourceDialogs.rb
Expand Up @@ -1966,7 +1966,8 @@ def ServerWidget
def IsAnyNetworkAvailable
ret = false

command = "TERM=dumb /sbin/ip -o address show | /usr/bin/grep inet | /usr/bin/grep -v scope.host"
command = "TERM=dumb /sbin/ip -o address show | /usr/bin/grep inet | " \
"/usr/bin/grep -v scope.host"
Builtins.y2milestone("Running %1", command)
cmd_run = SCR.Execute(path(".target.bash_output"), command)
Builtins.y2milestone("Command returned: %1", cmd_run)
Expand Down

0 comments on commit 3a34ef1

Please sign in to comment.