mirror of
https://github.com/safing/portmaster
synced 2025-09-01 18:19:12 +00:00
Show warning on unexpected portmaster-start binary path
This commit is contained in:
parent
504c753a9b
commit
81c6ed2906
3 changed files with 30 additions and 9 deletions
|
@ -46,6 +46,19 @@ fi
|
|||
# build tools
|
||||
EXTRA_LD_FLAGS=""
|
||||
if [[ $GOOS == "windows" ]]; then
|
||||
# checks
|
||||
if [[ $CC_FOR_windows_amd64 == "" ]]; then
|
||||
echo "ENV variable CC_FOR_windows_amd64 (c compiler) is not set. Please set it to the cross compiler you want to use for compiling for windows_amd64"
|
||||
exit 1
|
||||
fi
|
||||
if [[ $CXX_FOR_windows_amd64 == "" ]]; then
|
||||
echo "ENV variable CXX_FOR_windows_amd64 (c++ compiler) is not set. Please set it to the cross compiler you want to use for compiling for windows_amd64"
|
||||
exit 1
|
||||
fi
|
||||
# compilers
|
||||
export CC=$CC_FOR_windows_amd64
|
||||
export CXX=$CXX_FOR_windows_amd64
|
||||
# custom
|
||||
export CGO_ENABLED=1
|
||||
EXTRA_LD_FLAGS='-H windowsgui' # Hide console window by default (but we attach to parent console if available)
|
||||
# generate resource.syso for windows metadata / icon
|
||||
|
|
|
@ -185,7 +185,13 @@ func start() error {
|
|||
}
|
||||
|
||||
// react to upgrades
|
||||
return initUpgrader()
|
||||
if err := initUpgrader(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
warnOnIncorrectParentPath()
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// TriggerUpdate queues the update task to execute ASAP.
|
||||
|
|
|
@ -148,13 +148,15 @@ func upgradePortmasterStart() error {
|
|||
}
|
||||
log.Infof("updates: upgraded %s", rootPmStartPath)
|
||||
|
||||
// TODO(ppacher): remove once we released a few more versions ...
|
||||
warnOnIncorrectParentPath(filename)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func warnOnIncorrectParentPath(expectedFileName string) {
|
||||
func warnOnIncorrectParentPath() {
|
||||
expectedFileName := "portmaster-start"
|
||||
if onWindows {
|
||||
expectedFileName += ".exe"
|
||||
}
|
||||
|
||||
// upgrade parent process, if it's portmaster-start
|
||||
parent, err := processInfo.NewProcess(int32(os.Getppid()))
|
||||
if err != nil {
|
||||
|
@ -191,10 +193,10 @@ func warnOnIncorrectParentPath(expectedFileName string) {
|
|||
if !strings.HasPrefix(absPath, root) {
|
||||
log.Warningf("detected unexpected path %s for portmaster-start", absPath)
|
||||
|
||||
// TODO(ppacher): once we released a new installer and folks had time
|
||||
// to update we should send a module warning/hint to the
|
||||
// UI notifying the user that he's using portmaster-start
|
||||
// from a wrong location.
|
||||
notifications.NotifyWarn(
|
||||
"updates:unsupported-parent",
|
||||
fmt.Sprintf("The portmaster has been launched by an unexpected %s binary at %s. Please configure your system to use the binary at %s as this version will be kept up to date automatically.", expectedFileName, absPath, filepath.Join(root, expectedFileName)),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue