From 8273ad411d62de7f024ac3bc2db7ff21996b34d4 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Thu, 11 Apr 2013 15:55:03 +0200 Subject: [PATCH] type fixed. config will not be overwritten, if exists --- linux-update.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-update.rb b/linux-update.rb index 8bb255e..1a36552 100755 --- a/linux-update.rb +++ b/linux-update.rb @@ -61,7 +61,7 @@ module LinuxUpdate end def make *opts, &block - block ||= lambda {|rd| IO::copy_stream rd, STDOUT } } + block ||= lambda {|rd| IO::copy_stream rd, STDOUT } dir = @dir.to_s rd, wr = IO.pipe pid = fork do @@ -286,7 +286,7 @@ module LinuxUpdate ELD def oldconfig version = nil version, config = base.oldconfig_prepare( version, options[:config]) - version.import_config config if nil != options['config'] and config + version.import_config config if nil != options['config'] and config and not version.config.exist? version.oldconfig end @@ -301,7 +301,7 @@ module LinuxUpdate desc 'menuconfig|configure [VERSION]', 'Configure your linux-VERSION. (default: most actual version).' def menuconfig version = nil version, config = base.oldconfig_prepare( version, options[:config]) - version.import_config config if nil != options['config'] and config + version.import_config config if nil != options['config'] and config and not version.config.exist? version.menuconfig end map configure: :menuconfig @@ -321,7 +321,7 @@ module LinuxUpdate desc 'all [VERSION]', 'Will oldconfig, compile and install kernel and modules. See these methods.' def all version = nil version, config = base.oldconfig_prepare( version, options[:config]) - version.import_config config if nil != options['config'] and config + version.import_config config if nil != options['config'] and config and not version.config.exist? version.oldconfig version.compile version.install