lib/ronin/config.rb in ronin-1.5.0 vs lib/ronin/config.rb in ronin-1.5.1

- old
+ new

@@ -1,9 +1,9 @@ # -# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com) +# Copyright (c) 2006-2021 Hal Brodigan (postmodern.mod3 at gmail.com) # -# This file is part of Ronin. +# This file is part of ronin. # # Ronin is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. @@ -12,11 +12,11 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Ronin. If not, see <http://www.gnu.org/licenses/>. +# along with Ronin. If not, see <https://www.gnu.org/licenses/>. # require 'data_paths' require 'fileutils' @@ -67,13 +67,11 @@ # # => true # # @api semipublic # def Config.load(name=nil) - dir, file = if name - [CONFIG_DIR, "#{name}.rb"] - else - [PATH, 'config.rb'] + dir, file = if name then [CONFIG_DIR, "#{name}.rb"] + else [PATH, 'config.rb'] end path = File.expand_path(File.join(dir,file)) require path if File.file?(path) end