lib/omnibus/generator.rb in omnibus-7.0.13 vs lib/omnibus/generator.rb in omnibus-7.0.34

@@ -12,11 +12,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 
-require "thor"
+require "thor" unless defined?(Thor)
 
 module Omnibus
   class Generator < Thor::Group
     include Thor::Actions
 
@@ -71,10 +71,10 @@
       default: false
 
     class << self
       # Set the source root for Thor
       def source_root
-        File.expand_path("../generator_files", __FILE__)
+        File.expand_path("generator_files", __dir__)
       end
     end
 
     def create_project_files
       template("Gemfile.erb", "#{target}/Gemfile", template_options)