TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

hostinfo: update Windows hostinfo to include MSIDist registry value

Browse Source 
We need to expand our enviornment information to include info about
the Windows store. Thinking about future plans, it would be nice
to include both the packaging mechanism and the distribution mechanism.

In this PR we change packageTypeWindows to check a new registry value
named MSIDist, and concatenate that value to "msi/" when present.

We also remove vestigial NSIS detection.

Updates https://github.com/tailscale/corp/issues/2790

Signed-off-by: Aaron Klotz <aaron@tailscale.com>
This commit is contained in:
Aaron Klotz 2024-04-30 12:23:40 -06:00
parent 87c5ad4c2c
commit 2cb408f9b1
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hostinfo/hostinfo_windows.go
View File

@ -72,10 +72,6 @@ func packageTypeWindows() string {
if _, err := os.Stat(`C:\ProgramData\chocolatey\lib\tailscale`); err == nil { if _, err := os.Stat(`C:\ProgramData\chocolatey\lib\tailscale`); err == nil {
return "choco" return "choco"
} }
msiSentinel, _ := winutil.GetRegInteger("MSI")
if msiSentinel == 1 {
return "msi"
}
exe, err := os.Executable() exe, err := os.Executable()
if err != nil { if err != nil {
return "" return ""
@ -84,13 +80,15 @@ func packageTypeWindows() string {
if strings.HasPrefix(exe, filepath.Join(home, "scoop", "apps", "tailscale")) { if strings.HasPrefix(exe, filepath.Join(home, "scoop", "apps", "tailscale")) {
return "scoop" return "scoop"
} }
dir := filepath.Dir(exe) msiSentinel, _ := winutil.GetRegInteger("MSI")
nsisUninstaller := filepath.Join(dir, "Uninstall-Tailscale.exe") if msiSentinel != 1 {
_, err = os.Stat(nsisUninstaller)
if err == nil {
return "nsis"
}
// Atypical. Not worth trying to detect. Likely open // Atypical. Not worth trying to detect. Likely open
// source tailscaled or a developer running by hand. // source tailscaled or a developer running by hand.
return "" return ""
} }
result := "msi"
if env, _ := winutil.GetRegString("MSIDist"); env != "" {
result += "/" + env
}
return result
}