Fixed up build files some more

Author: OJ

Diff for: Makefile

@@ -2,22 +2,40 @@ TARGET=./build
 OSES=darwin linux windows
 ARCHS=amd64 386
 
-all:
+current: outputdir
+	@go build -o ./gobuster; \
+	echo "Done."
+
+outputdir:
 	@mkdir -p ${TARGET}
-	@for GOOS in ${OSES}; do \
-		for GOARCH in ${ARCHS}; do \
-			echo "Building for $${GOOS} $${GOARCH} ..." ; \
-			if [ "$${GOOS}" == "windows" ]; then \
-				GOOS=$${GOOS} GARCH=$${GOARCH} go build -o ${TARGET}/gobuster-$${GOARCH}.exe ; \
-			else \
-				GOOS=$${GOOS} GARCH=$${GOARCH} go build -o ${TARGET}/gobuster-$${GOOS}-$${GOARCH} ; \
-			fi; \
-		done; \
+
+windows: outputdir
+	@for GOARCH in ${ARCHS}; do \
+		echo "Building for windows $${GOARCH} ..." ; \
+		GOOS=windows GARCH=$${GOARCH} go build -o ${TARGET}/gobuster-$${GOARCH}.exe ; \
+	done; \
+	echo "Done."
+
+linux: outputdir
+	@for GOARCH in ${ARCHS}; do \
+		echo "Building for linux $${GOARCH} ..." ; \
+		GOOS=linux GARCH=$${GOARCH} go build -o ${TARGET}/gobuster-linux-$${GOARCH} ; \
 	done; \
 	echo "Done."
 
+darwin: outputdir
+	@for GOARCH in ${ARCHS}; do \
+		echo "Building for darwin $${GOARCH} ..." ; \
+		GOOS=darwin GARCH=$${GOARCH} go build -o ${TARGET}/gobuster-darwin-$${GOARCH} ; \
+	done; \
+	echo "Done."
+
+
+all: darwin linux windows
+
 test:
-	@go test -v -race ./...
+	@go test -v -race ./... ; \
+	echo "Done."
 
 clean:
 	@rm -rf ${TARGET}/* ; \

Diff for: README.md

@@ -78,6 +78,14 @@ This will create a `gobuster` binary for you. If you want to install it in the `
 ```
 gobuster $ go install
 ```
+If you have all the dependencies already, you can make use of the build scripts:
+* `make` - builds for the current Go configuration (ie. runs `go build`).
+* `make windows` - builds 32 and 64 bit binaries for windows, and writes them to the `build` subfolder.
+* `make linux` - builds 32 and 64 bit binaries for linux, and writes them to the `build` subfolder.
+* `make darwin` - builds 32 and 64 bit binaries for darwin, and writes them to the `build` subfolder.
+* `make all` - builds for all platforms and architectures, and writes the resulting binaries to the `build` subfolder.
+* `make clean` - clears out the `build` subfolder.
+* `make test` - runs the tests (requires you to `go get githubcom/h2non/gock` first).
 
 #### Running as a script
 ```

Diff for: make.bat

@@ -1,37 +1,80 @@
 @echo off
 
+SET ARG=%1
 SET TARGET=.\build
 
-IF %1=="test" (
+IF "%ARG%"=="test" (
   go test -v -race ./...
+  echo Done.
+  GOTO Done
 )
 
-IF %1=="clean" (
-  del /F %TARGET%\*.*
+IF "%ARG%"=="clean" (
+  del /F /Q %TARGET%\*.*
+  echo Done.
+  GOTO Done
 )
 
-IF %1=="" (
-  echo "Building for windows ..."
-  set GOOS=windows
-  set GOARCH=amd64
-  go build -o %TARGET%\gobuster-%GOARCH%.exe
-  set GOARCH=386
-  go build -o %TARGET%\gobuster-%GOARCH%.exe
-
-  echo "Building for osx ..."
-  set GOOS=osx
-  set GOARCH=amd64
-  go build -o %TARGET%\gobuster-%GOOS%-%GOARCH%
-  set GOARCH=386
-  go build -o %TARGET%\gobuster-%GOOS%-%GOARCH%
-
-  echo "Building for linux ..."
-  set GOOS=osx
-  set GOARCH=amd64
-  go build -o %TARGET%\gobuster-%GOOS%-%GOARCH%
-  set GOARCH=386
-  go build -o %TARGET%\gobuster-%GOOS%-%GOARCH%
-
-  echo "Done."
+IF "%ARG%"=="windows" (
+  CALL :Windows
+  GOTO Done
 )
 
+IF "%ARG%"=="darwin" (
+  CALL :Darwin
+  GOTO Done
+)
+
+IF "%ARG%"=="linux" (
+  CALL :Linux
+  GOTO Done
+)
+
+IF "%ARG%"=="all" (
+  CALL :Darwin
+  CALL :Linux
+  CALL :Windows
+  GOTO Done
+)
+
+IF "%ARG%"=="" (
+  go build -o .\gobuster.exe
+  GOTO Done
+)
+
+GOTO Done
+
+:Darwin
+set GOOS=darwin
+set GOARCH=amd64
+echo Building for %GOOS% %GOARCH% ...
+go build -o %TARGET%\gobuster-%GOOS%-%GOARCH%
+set GOARCH=386
+echo Building for %GOOS% %GOARCH% ...
+go build -o %TARGET%\gobuster-%GOOS%-%GOARCH%
+echo Done.
+EXIT /B 0
+
+:Linux
+set GOOS=linux
+set GOARCH=amd64
+echo Building for %GOOS% %GOARCH% ...
+go build -o %TARGET%\gobuster-%GOOS%-%GOARCH%
+set GOARCH=386
+echo Building for %GOOS% %GOARCH% ...
+go build -o %TARGET%\gobuster-%GOOS%-%GOARCH%
+echo Done.
+EXIT /B 0
+
+:Windows
+set GOOS=windows
+set GOARCH=amd64
+echo Building for %GOOS% %GOARCH% ...
+go build -o %TARGET%\gobuster-%GOARCH%.exe
+set GOARCH=386
+echo Building for %GOOS% %GOARCH% ...
+go build -o %TARGET%\gobuster-%GOARCH%.exe
+echo Done.
+EXIT /B 0
+
+:Done