Set SMARTGIT_JAVA_HOME environment variable

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 18.2.0-3 (2018/12/04)
+
+* SmartGit 18.2 works only on 64-bits systems
+* Set `SMARTGIT_JAVA_HOME` environment variable
+* Include our own jre
+
 ## 18.2.0-2 (2018/12/01)
 
 * Upgrade to SmartGit 18.2.0

main.go

@@ -4,7 +4,6 @@ package main
 
 import (
 	"os"
-	"runtime"
 	"strings"
 
 	. "github.com/portapps/portapps"
@@ -17,14 +16,9 @@ func init() {
 }
 
 func main() {
-	smartgitExe := "smartgit32.exe"
-	if runtime.GOARCH == "amd64" {
-		smartgitExe = "smartgit.exe"
-	}
-
 	Papp.AppPath = AppPathJoin("app")
 	Papp.DataPath = CreateFolder(AppPathJoin("data"))
-	Papp.Process = PathJoin(Papp.AppPath, "bin", smartgitExe)
+	Papp.Process = PathJoin(Papp.AppPath, "bin", "smartgit.exe")
 	Papp.Args = nil
 	Papp.WorkingDir = PathJoin(Papp.AppPath, "bin")
 
@@ -54,5 +48,8 @@ func main() {
 		Log.Errorf("Cannot write system smartgit.vmoptions: %s", err)
 	}
 
+	// set JAVA_HOME
+	OverrideEnv("SMARTGIT_JAVA_HOME", PathJoin(Papp.AppPath, "jre"))
+
 	Launch(os.Args[1:])
 }