Merge pull request #10 from macadmins/no_lanch_services

flag for not rebuilding launch services

Author: grahamgilbert

README.md

@@ -14,3 +14,11 @@ To set other browsers as the default, use the following identifiers:
 - Safari: `com.apple.safari`
 - Firefox: `org.mozilla.firefox`
 - MS Edge: `com.microsoft.edgemac`
+
+## Known issues
+
+### System Settings may not work correctly
+
+If System Settings doesn't show all sections correctly after running, this tool, restart the machine. This is likely a timing issue with Launch Services, but we haven't reproduced it consistently. If you see that a restart doesn't fix the issue, you way wish to use the `---no-rebuild-launchservices` flag. This will mean that you need to reboot after running the tool.
+
+![System Settings screenshot](assets/system_settings.png)

assets/system_settings.png

@@ -13,16 +13,18 @@ var version string
 
 func main() {
 	var identifier string
+	var noRebuildLaunchServices bool
 
 	var rootCmd = &cobra.Command{
 		Use:   "default-browser",
 		Short: "A cli tool to set the default browser on macOS",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return setDefault(identifier)
+			return setDefault(identifier, noRebuildLaunchServices)
 		},
 	}
 
 	rootCmd.Flags().StringVar(&identifier, "identifier", "com.google.chrome", "An identifier for the application")
+	rootCmd.Flags().BoolVar(&noRebuildLaunchServices, "no-rebuild-launchservices", false, "Do not rebuild launch services. Only use if you are experiencing issues with System Settings not displaying correctly after a reboot.")
 
 	rootCmd.Version = version
 	rootCmd.SetVersionTemplate("default-browser version {{.Version}}\n")
@@ -33,7 +35,7 @@ func main() {
 	}
 }
 
-func setDefault(identifier string) error {
+func setDefault(identifier string, noRebuildLaunchServices bool) error {
 	if identifier == "" {
 		return fmt.Errorf("identifier cannot be empty")
 	}
@@ -48,7 +50,7 @@ func setDefault(identifier string) error {
 		return err
 	}
 
-	err = launchservices.ModifyLS(c, identifier)
+	err = launchservices.ModifyLS(c, identifier, noRebuildLaunchServices)
 	if err != nil {
 		return err
 	}

main.go

@@ -9,7 +9,7 @@ import (
 
 const lsregister = "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister"
 
-func ModifyLS(c client.Client, identifier string) error {
+func ModifyLS(c client.Client, identifier string, noRebuildLaunchServices bool) error {
 	plist, err := GetPlist(c.PlistLocation)
 	if err != nil {
 		return err
@@ -39,7 +39,8 @@ func ModifyLS(c client.Client, identifier string) error {
 		fmt.Printf("lsregister does not exist at %s. You should restart the device to rebuild launchservices", lsregister)
 		return nil
 	}
-	err = rebuildLaunchServices(c)
+
+	err = rebuildLaunchServices(c, noRebuildLaunchServices)
 	if err != nil {
 		return err
 	}
@@ -52,10 +53,12 @@ func ModifyLS(c client.Client, identifier string) error {
 	return nil
 }
 
-func rebuildLaunchServices(c client.Client) error {
-	_, err := c.Runner.RunCmd(lsregister, "-kill", "-r", "-domain", "local", "-domain", "system", "-domain", "user")
-	if err != nil {
-		return err
+func rebuildLaunchServices(c client.Client, noRebuildLaunchServices bool) error {
+	if !noRebuildLaunchServices {
+		_, err := c.Runner.RunCmd(lsregister, "-kill", "-r", "-domain", "local", "-domain", "system", "-domain", "user")
+		if err != nil {
+			return err
+		}
 	}
 	return nil
 }

pkg/launchservices/launchservices.go

@@ -19,8 +19,11 @@ func TestRebuildLaunchServices(t *testing.T) {
 		Runner: mockRunner,
 	}
 
-	err := rebuildLaunchServices(mockClient)
+	err := rebuildLaunchServices(mockClient, false)
 	assert.NoError(t, err, "rebuildLaunchServices should not return an error")
+
+	err = rebuildLaunchServices(mockClient, true)
+	assert.NoError(t, err, "rebuildLaunchServices should not return an error when noRebuildLaunchServices is true")
 }
 
 func TestKilllsd(t *testing.T) {