From f203b2f0a71053343b7fb7690b16b16546826578 Mon Sep 17 00:00:00 2001
From: Azareal <azareal@users.noreply.github.com>
Date: Wed, 4 Apr 2018 12:25:34 +0100
Subject: [PATCH] Let's use proper Git for updates for now as Go Git refuses to
 work properly.

---
 dev-update.bat               | 112 +++++++++++++++++++++++++++++++++++
 update.bat => new-update.bat |   0
 updater/main.go              |   4 +-
 3 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 dev-update.bat
 rename update.bat => new-update.bat (100%)

diff --git a/dev-update.bat b/dev-update.bat
new file mode 100644
index 00000000..f63c648a
--- /dev/null
+++ b/dev-update.bat
@@ -0,0 +1,112 @@
+@echo off
+echo Updating the dependencies
+
+echo Updating the MySQL Driver
+go get -u github.com/go-sql-driver/mysql
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Updating the PostgreSQL Driver
+go get -u github.com/lib/pq
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Updating the MSSQL Driver
+go get -u github.com/denisenkom/go-mssqldb
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Updating the bcrypt library
+go get -u golang.org/x/crypto/bcrypt
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Updating /x/sys/windows (dependency for gopsutil)
+go get -u golang.org/x/sys/windows
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Updating wmi (dependency for gopsutil)
+go get -u github.com/StackExchange/wmi
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Updating the gopsutil library
+go get -u github.com/Azareal/gopsutil
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Updating the WebSockets library
+go get -u github.com/gorilla/websocket
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Updating Sourcemap (dependency for OttoJS)
+go get -u gopkg.in/sourcemap.v1
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Updating OttoJS
+go get -u github.com/robertkrimen/otto
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Updating the Rez Image Resizer
+go get -u github.com/bamiaux/rez
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Updating fsnotify
+go get -u github.com/fsnotify/fsnotify
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Updating Go Git
+go get -u gopkg.in/src-d/go-git.v4/...
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Updating GopherJS
+go get -u github.com/gopherjs/gopherjs
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+
+echo Updating Gosora
+git pull
+if %errorlevel% neq 0 (
+	pause
+	exit /b %errorlevel%
+)
+
+echo Patching Gosora
+go build ./patcher
+patcher.exe
\ No newline at end of file
diff --git a/update.bat b/new-update.bat
similarity index 100%
rename from update.bat
rename to new-update.bat
diff --git a/updater/main.go b/updater/main.go
index 2e114b18..06b3cc10 100644
--- a/updater/main.go
+++ b/updater/main.go
@@ -68,7 +68,7 @@ func updater(scanner *bufio.Scanner) bool {
 		return logError(err)
 	}
 
-	err = workTree.Reset(&git.ResetOptions{Mode: git.MixedReset})
+	err = workTree.Reset(&git.ResetOptions{Mode: git.HardReset})
 	if err != nil {
 		return logError(err)
 	}
@@ -88,7 +88,7 @@ func updater(scanner *bufio.Scanner) bool {
 
 	switch runtime.GOOS {
 	case "windows":
-		err = syscall.Exec("./patcher.bat", []string{}, os.Environ())
+		err = syscall.Exec("./patcher.bat", []string{}, os.Environ()) // doesn't work, need something for windows
 	default: //linux, etc.
 		err = syscall.Exec("./patcher-linux", []string{}, os.Environ())
 	}