lib/cutego
1
0
Fork 0
mirror of https://github.com/bluszcz/cutego.git synced 2024-09-28 13:15:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #585 from creedr/master

Browse source 
Fix for MSYS2 being installed on drive other than C:\
This commit is contained in:
therecipe 2018-04-09 20:48:32 +02:00 committed by GitHub
commit 3de5d57381
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/utils/windows.go
View file

@ -5,6 +5,7 @@ import (
"os"
"path/filepath"
"runtime"
"strings"
)
func QT_MSYS2() bool {
@ -18,6 +19,7 @@ func QT_MSYS2_DIR() string {
}
return filepath.Join(dir, "mingw32")
}
drive := strings.Split(dir, string(os.PathSeparator))[0]
prefix := "msys32"
if runtime.GOARCH == "amd64" {
prefix = "msys64"
@ -26,7 +28,7 @@ func QT_MSYS2_DIR() string {
if QT_MSYS2_ARCH() == "amd64" {
suffix = "mingw64"
}
return fmt.Sprintf("C:\\%v\\%v", prefix, suffix)
return fmt.Sprintf("%v\\%v\\%v", drive, prefix, suffix)
}
func IsMsys2QtDir() bool {