fmt and bump

.gitignore

@@ -0,0 +1 @@
+check/firefox/*

Makefile

@@ -0,0 +1,7 @@
+VERSION=0.0.02
+
+fmt:
+	gofmt -w -s *.go
+
+release: fmt
+	gothub release -p -u eyedeekay -r "go-fpw" -t v$(VERSION) -n "lib" -d "tag for release"

check/main.go

@@ -0,0 +1,10 @@
+package main
+
+import (
+    "log"
+    "github.com/eyedeekay/go-fpw"
+)
+
+func main() {
+	log.Println(fcw.PortablePath())
+}

messagebox.go

@@ -34,7 +34,7 @@ import (
 	"syscall"
 )
 
-func messageBox(title, text string) bool {
+func MessageBox(title, text string) bool {
 	if runtime.GOOS == "linux" {
 		err := exec.Command("zenity", "--question", "--title", title, "--text", text).Run()
 		if err != nil {

messagebox_windows.go

@@ -31,7 +31,7 @@ import (
 	"unsafe"
 )
 
-func messageBox(title, text string) bool {
+func MessageBox(title, text string) bool {
 	user32 := syscall.NewLazyDLL("user32.dll")
 	messageBoxW := user32.NewProc("MessageBoxW")
 	mbYesNo := 0x00000004

ui.go

@@ -30,6 +30,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"runtime"
 	"strings"
 
@@ -45,6 +46,49 @@ type UI interface {
 // executable file.
 var FirefoxExecutable = LocateFirefox
 
+func PortablePath() string {
+	dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
+	if err != nil {
+		log.Println("An error was encountered detecting the portable path", err)
+	}
+	listing, err := ioutil.ReadDir(dir)
+	for _, appdir := range listing {
+		if appdir.IsDir() {
+			for _, exe := range portableFiles() {
+				path := filepath.Join(dir, appdir.Name(), exe)
+				if _, err := os.Stat(path); os.IsNotExist(err) {
+					continue
+				}
+				log.Println(path)
+				return path
+			}
+
+		}
+	}
+	return "false"
+}
+
+func portableFiles() []string {
+	var paths []string
+	switch runtime.GOOS {
+	case "windows":
+		paths = []string{
+			"firefox.exe",
+			"icecat.exe",
+			"waterfox.exe",
+		}
+	default:
+		paths = []string{
+			"firefox-esr",
+			"firefox",
+			"waterfox",
+			"icecat",
+			"purebrowser",
+		}
+	}
+	return paths
+}
+
 // LocateFirefox returns a path to the Firefox binary, or an empty string if
 // Firefox installation is not found.
 func LocateFirefox() string {
@@ -56,6 +100,11 @@ func LocateFirefox() string {
 		}
 	}
 
+	portable := PortablePath()
+	if portable != "false" {
+		return portable
+	}
+
 	var paths []string
 	switch runtime.GOOS {
 	case "darwin":
@@ -79,7 +128,9 @@ func LocateFirefox() string {
 		paths = []string{
 			"/usr/bin/firefox-esr",
 			"/usr/bin/firefox",
+			"/usr/bin/waterfox",
 			"/usr/bin/icecat",
+			"/usr/bin/purebrowser",
 		}
 	}
 
@@ -99,7 +150,7 @@ func PromptDownload() {
 	text := "No Firefox installation was found. Would you like to download and install it now?"
 
 	// Ask user for confirmation
-	if !messageBox(title, text) {
+	if !MessageBox(title, text) {
 		return
 	}