Merge branch 'master' of github.com:browsh-org/browsh

browsh-org · Jul 11, 2018 · 3cc5485 · 3cc5485
2 parents b4c9f2d + a3b8c05
commit 3cc5485
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/interfacer/contrib/setup_go.sh b/interfacer/contrib/setup_go.sh
@@ -4,6 +4,12 @@ set -e
 # Install `dep` the current defacto dependency for Golang
 GOLANG_DEP_VERSION=0.3.2
 dep_url=https://github.com/golang/dep/releases/download/v$GOLANG_DEP_VERSION/dep-linux-amd64
+
+if [ -z $GOPATH ]; then
+  echo '$GOPATH is not set, aborting'
+  exit 1
+fi
+
 curl -L -o $GOPATH/bin/dep $dep_url
 chmod +x $GOPATH/bin/dep
 
diff --git a/interfacer/src/browsh/firefox.go b/interfacer/src/browsh/firefox.go
@@ -104,7 +104,14 @@ func ensureFirefoxBinary() {
 		}
 	}
 	if _, err := os.Stat(*firefoxBinary); os.IsNotExist(err) {
-		Shutdown(errors.New("Firefox binary not found: " + *firefoxBinary))
+		if runtime.GOOS == "windows" {
+			*firefoxBinary = `c:\Program Files\Mozilla Firefox\firefox.exe`
+			if _, err := os.Stat(*firefoxBinary); os.IsNotExist(err) {
+				Shutdown(errors.New(`Firefox binary not found in: c:\Program Files (x86)\Mozilla Firefox\firefox.exe or ` + *firefoxBinary))
+			}
+		} else {
+			Shutdown(errors.New("Firefox binary not found: " + *firefoxBinary))
+		}
 	}
 }