Merge pull request #12 from macadmins/update_lsregister

We rescan rather than rebuild now

Author: grahamgilbert

main.go

@@ -13,18 +13,19 @@ var version string
 
 func main() {
 	var identifier string
-	var noRebuildLaunchServices bool
+	var noRescanLaunchServices 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, noRebuildLaunchServices)
+			return setDefault(identifier, noRescanLaunchServices)
 		},
 	}
 
 	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.Flags().BoolVar(&noRescanLaunchServices, "no-rescan-launchservices", false, "Do not rescan launch services. Only use if you are experiencing issues with System Settings not displaying correctly after a reboot.")
+	rootCmd.Flags().BoolVar(&noRescanLaunchServices, "no-rebuild-launchservices", false, "Legacy: same as --no-rescan-launchservices")
 
 	rootCmd.Version = version
 	rootCmd.SetVersionTemplate("default-browser version {{.Version}}\n")
@@ -35,7 +36,7 @@ func main() {
 	}
 }
 
-func setDefault(identifier string, noRebuildLaunchServices bool) error {
+func setDefault(identifier string, noRescanLaunchServices bool) error {
 	if identifier == "" {
 		return fmt.Errorf("identifier cannot be empty")
 	}
@@ -50,7 +51,7 @@ func setDefault(identifier string, noRebuildLaunchServices bool) error {
 		return err
 	}
 
-	err = launchservices.ModifyLS(c, identifier, noRebuildLaunchServices)
+	err = launchservices.ModifyLS(c, identifier, noRescanLaunchServices)
 	if err != nil {
 		return err
 	}

pkg/launchservices/launchservices.go

@@ -9,7 +9,7 @@ import (
 
 const lsregister = "/System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister"
 
-func ModifyLS(c client.Client, identifier string, noRebuildLaunchServices bool) error {
+func ModifyLS(c client.Client, identifier string, noRescanLaunchServices bool) error {
 	plist, err := GetPlist(c.PlistLocation)
 	if err != nil {
 		return err
@@ -40,7 +40,7 @@ func ModifyLS(c client.Client, identifier string, noRebuildLaunchServices bool)
 		return nil
 	}
 
-	err = rebuildLaunchServices(c, noRebuildLaunchServices)
+	err = rescanLaunchServices(c, noRescanLaunchServices)
 	if err != nil {
 		return err
 	}
@@ -53,8 +53,8 @@ func ModifyLS(c client.Client, identifier string, noRebuildLaunchServices bool)
 	return nil
 }
 
-func rebuildLaunchServices(c client.Client, noRebuildLaunchServices bool) error {
-	if !noRebuildLaunchServices {
+func rescanLaunchServices(c client.Client, noRescanLaunchServices bool) error {
+	if !noRescanLaunchServices {
 		_, err := c.Runner.RunCmd(lsregister, "-gc", "-R", "-all", "user,system,local,network")
 		if err != nil {
 			return err

pkg/launchservices/launchservices_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestRebuildLaunchServices(t *testing.T) {
+func TestRescanLaunchServices(t *testing.T) {
 	mockRunner := utils.MockCmdRunner{
 		Output: "",
 		Err:    nil,
@@ -19,11 +19,11 @@ func TestRebuildLaunchServices(t *testing.T) {
 		Runner: mockRunner,
 	}
 
-	err := rebuildLaunchServices(mockClient, false)
-	assert.NoError(t, err, "rebuildLaunchServices should not return an error")
+	err := rescanLaunchServices(mockClient, false)
+	assert.NoError(t, err, "rescanLaunchServices should not return an error")
 
-	err = rebuildLaunchServices(mockClient, true)
-	assert.NoError(t, err, "rebuildLaunchServices should not return an error when noRebuildLaunchServices is true")
+	err = rescanLaunchServices(mockClient, true)
+	assert.NoError(t, err, "rescanLaunchServices should not return an error when noRebuildLaunchServices is true")
 }
 
 func TestKilllsd(t *testing.T) {