piwalker/FCLauncher
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 5 Wiki Activity

fixed windows issues

Browse Source
This commit is contained in:
Samuel Walker 2024-10-26 22:33:33 -06:00
parent 99a5934575
commit 4e6ea6f22b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fclauncher/InstanceManager.go
View File

@ -115,13 +115,13 @@ func (i *InstanceManager)checkJavaVersion(instance Instance){
for sc.Scan() { for sc.Scan() {
line := sc.Text() line := sc.Text()
if strings.HasPrefix(line, "JavaPath=") { if strings.HasPrefix(line, "JavaPath=") {
line = fmt.Sprintf("JavaPath=%s/FCLauncher/java/java-%d-%s/bin/%s", confDir, javaVer, plat, exe) line = fmt.Sprintf("JavaPath=%s/FCLauncher/java/java-%d-%s/bin/%s", strings.ReplaceAll(confDir, "\\", "/"), javaVer, plat, exe)
found = true found = true
} }
f.WriteString(line+"\n") f.WriteString(line+"\n")
} }
if !found { if !found {
line := fmt.Sprintf("JavaPath=%s/FCLauncher/java/java-%d-%s/bin/%s", confDir, javaVer, plat, exe) line := fmt.Sprintf("JavaPath=%s/FCLauncher/java/java-%d-%s/bin/%s", strings.ReplaceAll(confDir, "\\", "/"), javaVer, plat, exe)
f.WriteString(line+"\n") f.WriteString(line+"\n")
f.WriteString("OverrideJavaLocation=true\nOverrideJava=true\n") f.WriteString("OverrideJavaLocation=true\nOverrideJava=true\n")
} }

2
fclauncher/Prism.go
View File

@ -122,7 +122,7 @@ func (p *Prism) Install() {
for scanner.Scan() { for scanner.Scan() {
line := scanner.Text() line := scanner.Text()
if strings.HasPrefix(line, "JavaPath") { if strings.HasPrefix(line, "JavaPath") {
line = fmt.Sprintf("JavaPath=%s/FCLauncher/java/java-21-%s", dir, shortSuffix) line = fmt.Sprintf("JavaPath=%s/FCLauncher/java/java-21-%s", strings.ReplaceAll(dir, "\\", "/"), shortSuffix)
} }
if strings.HasPrefix(line, "LastHostname") { if strings.HasPrefix(line, "LastHostname") {
host, _ := os.Hostname() host, _ := os.Hostname()