lib/u3d/installer.rb in u3d-1.0.3 vs lib/u3d/installer.rb in u3d-1.0.4

@@ -99,23 +99,13 @@
 
       CommonInstaller.sanitize_install(source_path, new_path, command, dry_run: dry_run)
     end
 
     def installed
-      unless (`mdutil -s /` =~ /disabled/).nil?
-        $stderr.puts 'Please enable Spotlight indexing for /Applications.'
-        exit(1)
-      end
+      paths = (list_installed_paths + spotlight_installed_paths).uniq
+      versions = paths.map { |path| MacInstallation.new(path: path) }
 
-      bundle_identifiers = ['com.unity3d.UnityEditor4.x', 'com.unity3d.UnityEditor5.x']
-
-      mdfind_args = bundle_identifiers.map { |bi| "kMDItemCFBundleIdentifier == '#{bi}'" }.join(' || ')
-
-      cmd = "mdfind \"#{mdfind_args}\" 2>/dev/null"
-      UI.verbose cmd
-      versions = `#{cmd}`.split("\n").map { |path| MacInstallation.new(path: path) }
-
       # sorting should take into account stable/patch etc
       versions.sort! { |x, y| x.version <=> y.version }
     end
 
     # rubocop:disable UnusedMethodArgument
@@ -156,9 +146,33 @@
       end
     rescue => e
       UI.error "Failed to install pkg at #{file_path}: #{e}"
     else
       UI.success "Successfully installed package from #{file_path}"
+    end
+
+    private
+
+    def list_installed_paths
+      find = File.join(DEFAULT_MAC_INSTALL, 'Unity*', 'Unity.app')
+      paths = Dir[find].map { |path| File.expand_path('..', path) }
+      paths
+    end
+
+    def spotlight_installed_paths
+      unless (`mdutil -s /` =~ /disabled/).nil?
+        UI.warning 'Please enable Spotlight indexing for /Applications.'
+        return []
+      end
+
+      bundle_identifiers = ['com.unity3d.UnityEditor4.x', 'com.unity3d.UnityEditor5.x']
+
+      mdfind_args = bundle_identifiers.map { |bi| "kMDItemCFBundleIdentifier == '#{bi}'" }.join(' || ')
+
+      cmd = "mdfind \"#{mdfind_args}\" 2>/dev/null"
+      UI.verbose cmd
+      paths = `#{cmd}`.split("\n")
+      paths
     end
   end
 
   class LinuxInstaller
     def sanitize_install(unity, dry_run: false)