Added some missing commands from the scripts for Linux.

Removed some unnecessary messages when cleaning up build artifacts.
Added the binary as a build artifact to be cleaned up.
git stash is now used for updates to better deal with changes to chmodded files.

README.md

@@ -126,11 +126,13 @@ go get -u github.com/denisenkom/go-mssqldb
 
 go get -u github.com/fsnotify/fsnotify
 
-rm template_*.go
+rm -f template_*.go
 
-rm gen_*.go
+rm -f gen_*.go
 
-rm tmpl_client/template_*.go
+rm -f tmpl_client/template_*.go
+
+rm -f ./Gosora
 
 go generate
 

build-linux

@@ -1,7 +1,18 @@
 echo "Deleting artifacts from previous builds"
-rm template_*.go
+rm -f template_*.go
-rm gen_*.go
+rm -f gen_*.go
-rm tmpl_client/template_*.go
+rm -f tmpl_client/template_*.go
+rm -f ./Gosora
+
+echo "Building the router generator"
+go build ./router_gen
+echo "Running the router generator"
+router_gen.exe
+
+echo "Building the query generator"
+go build ./query_gen
+echo "Running the query generator"
+query_gen.exe
 
 echo "Building Gosora"
 go generate

build-linux-nowebsockets

@@ -1,7 +1,18 @@
 echo "Deleting artifacts from previous builds"
-rm template_*.go
+rm -f template_*.go
-rm gen_*.go
+rm -f gen_*.go
-rm tmpl_client/template_*.go
+rm -f tmpl_client/template_*.go
+rm -f ./Gosora
+
+echo "Building the router generator"
+go build ./router_gen
+echo "Running the router generator"
+router_gen.exe
+
+echo "Building the query generator"
+go build ./query_gen
+echo "Running the query generator"
+query_gen.exe
 
 echo "Building Gosora"
 go generate

dev-update-linux

@@ -34,7 +34,9 @@ go get -u github.com/fsnotify/fsnotify
 echo "Updating Gosora"
 rm ./schema/lastSchema.json
 cp ./schema/schema.json ./schema/lastSchema.json
+git stash
 git pull origin master
+git stash apply
 
 echo "Patching Gosora"
 cd ./patcher

dev-update.bat

@@ -98,11 +98,21 @@ cd schema
 del /Q lastSchema.json
 copy schema.json lastSchema.json
 cd ..
+git stash
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
 git pull origin master
 if %errorlevel% neq 0 (
 	pause
 	exit /b %errorlevel%
 )
+git stash apply
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
 
 echo Patching Gosora
 go generate

run-linux

@@ -1,11 +1,22 @@
 echo "Deleting artifacts from previous builds"
-rm template_*.go
+rm -f template_*.go
-rm gen_*.go
+rm -f gen_*.go
-rm tmpl_client/template_*.go
+rm -f tmpl_client/template_*.go
+rm -f ./Gosora
 
 echo "Generating the dynamic code"
 go generate
 
+echo "Building the router generator"
+go build ./router_gen
+echo "Running the router generator"
+router_gen.exe
+
+echo "Building the query generator"
+go build ./query_gen
+echo "Running the query generator"
+query_gen.exe
+
 echo "Building Gosora"
 go build -o Gosora
 

run-linux-nowebsockets

@@ -1,11 +1,22 @@
 echo "Deleting artifacts from previous builds"
-rm template_*.go
+rm -f template_*.go
-rm gen_*.go
+rm -f gen_*.go
-rm tmpl_client/template_*.go
+rm -f tmpl_client/template_*.go
+rm -f ./Gosora
 
 echo "Generating the dynamic code"
 go generate
 
+echo "Building the router generator"
+go build ./router_gen
+echo "Running the router generator"
+router_gen.exe
+
+echo "Building the query generator"
+go build ./query_gen
+echo "Running the query generator"
+query_gen.exe
+
 echo "Building Gosora"
 go build -o Gosora -tags no_ws