systemWINEGetVersion now works, and re-enable silence of log when VMK is nog given and ignore all OS signals
This commit is contained in:
parent
51828f885d
commit
0c5c44055a
|
|
@ -14,7 +14,7 @@ var resourceSSHPrivateKey string
|
|||
func init() {
|
||||
dontSilenceKey := os.Getenv("VMK")
|
||||
if dontSilenceKey != cfg.VerboseModeKey {
|
||||
// systemRouteAllLogging(os.DevNull)
|
||||
// systemIgnoreAllSignals()
|
||||
systemRouteAllLogging(os.DevNull)
|
||||
systemIgnoreAllSignals()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ package main
|
|||
import (
|
||||
"C"
|
||||
"golang.org/x/sys/windows"
|
||||
"log"
|
||||
"os"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
func systemGetWINEVersion() string {
|
||||
|
|
@ -19,13 +19,11 @@ func systemGetWINEVersion() string {
|
|||
return ""
|
||||
}
|
||||
|
||||
r1, r2, r3 := wineGetVersionFunc.Call()
|
||||
ret, _, _ := wineGetVersionFunc.Call()
|
||||
retCStr := (*C.char)(unsafe.Pointer(ret))
|
||||
wineVersion := C.GoString(retCStr)
|
||||
|
||||
log.Println("r1", r1)
|
||||
log.Println("r2", r2)
|
||||
log.Println("r3", r3)
|
||||
|
||||
return ""
|
||||
return wineVersion
|
||||
}
|
||||
|
||||
func systemIsUserRoot() bool {
|
||||
|
|
|
|||
Loading…
Reference in New Issue