Simplify how URLs are opened with a browser

Author: xyproto

engine/config.go

@@ -199,8 +199,8 @@ func New(versionString, description string) (*Config, error) {
 		// Mutex for rendering Pongo2 pages
 		pongomutex: &sync.RWMutex{},
 
-		// Program for opening URLs
-		defaultOpenExecutable: platformdep.DefaultOpenExecutable,
+		// Program for opening URLs, keep empty for using the default in url.go
+		defaultOpenExecutable: "",
 
 		// General information about Algernon
 		versionString: versionString,

engine/flags.go

@@ -352,11 +352,6 @@ func (ac *Config) handleFlags(serverTempDir string) {
 		}
 	}
 
-	// Use the default openExecutable if none is set
-	if ac.openURLAfterServing && ac.openExecutable == "" {
-		ac.openExecutable = ac.defaultOpenExecutable
-	}
-
 	// Add the serverConfScript to the list of configuration scripts to be read and executed
 	if ac.serverConfScript != "" && ac.serverConfScript != os.DevNull {
 		ac.serverConfigurationFilenames = append(ac.serverConfigurationFilenames, ac.serverConfScript, filepath.Join(ac.serverDirOrFilename, ac.serverConfScript))

engine/help.go

@@ -573,8 +573,8 @@ Available flags:
                                Quits after the file has been served once.
                                ("-m" is equivalent to "-q -o -z").
   -n, --nobanner               Don't display a colorful banner at start.
-  -o, --open=EXECUTABLE        Open the served URL in a browser or with the given
-                               executable (uses "` + ac.defaultOpenExecutable + `" by default).
+  -o, --open=EXECUTABLE        Open the served URL in a browser with a standard
+                               methodor or with the given (optional) executable.
   -p, --prod                   Serve HTTP/2+HTTPS on port 443. Serve regular
                                HTTP on port 80. Uses /srv/algernon for files.
                                Disables debug mode. Disables auto-refresh.

engine/url.go

@@ -29,15 +29,12 @@ func (ac *Config) OpenURL(host, cPort string, httpsPrefix bool) {
 	cmd := exec.Command(ac.openExecutable, url)
 	if ac.openExecutable == "" {
 		switch runtime.GOOS {
-		case "darwin":
-			ac.openExecutable = "open"
-			cmd = exec.Command("open", url)
-		case "linux":
-			ac.openExecutable = "xdg-open"
+		case "linux", "solaris":
 			cmd = exec.Command("xdg-open", url)
 		case "windows":
-			ac.openExecutable = ""
 			cmd = exec.Command("rundll32", "url.dll,FileProtocolHandler", url)
+		default: // darwin, bsd etc
+			cmd = exec.Command("open", url)
 		}
 	}