lib/ronin/ui/cli/script_command.rb in ronin-1.5.0 vs lib/ronin/ui/cli/script_command.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 'ronin/ui/cli/model_command' require 'ronin/ui/console' require 'ronin/script' @@ -161,14 +161,12 @@ # @since 1.1.0 # # @api semipublic # def load! - @script = if @file - self.class.model.load_from(@file) - else - query.load_first + @script = if @file then self.class.model.load_from(@file) + else query.load_first end unless @script print_error "Could not find or load the #{self.class.script_class.short_name}" exit -1 @@ -176,12 +174,9 @@ end # # Creates an OptionParser based on the parameters of one or more # objects. - # - # @param [Array<Parameters>] objects - # The objects that have parameters. # # @yield [opts] # If a block is given, it will be passed the newly created # OptionParser. #