TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscaled: remove tailscaled binary on uninstall-system-daemon

Browse Source 
Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2021-03-31 15:33:44 -07:00 committed by Maisem Ali
parent db13b2d0c8
commit 1c98c5f103
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/tailscaled/install_darwin.go
View File

@ -73,9 +73,18 @@ func uninstallSystemDaemonDarwin(args []string) (ret error) {
} }
} }
err = os.Remove(sysPlist) if err := os.Remove(sysPlist); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
err = nil err = nil
}
if ret == nil {
ret = err
}
}
if err := os.Remove(targetBin); err != nil {
if os.IsNotExist(err) {
err = nil
}
if ret == nil { if ret == nil {
ret = err ret = err
} }
@ -93,6 +102,9 @@ func installSystemDaemonDarwin(args []string) (err error) {
} }
}() }()
// Best effort:
uninstallSystemDaemonDarwin(nil)
// Copy ourselves to /usr/local/bin/tailscaled. // Copy ourselves to /usr/local/bin/tailscaled.
if err := os.MkdirAll(filepath.Dir(targetBin), 0755); err != nil { if err := os.MkdirAll(filepath.Dir(targetBin), 0755); err != nil {
return err return err
@ -127,9 +139,6 @@ func installSystemDaemonDarwin(args []string) (err error) {
return err return err
} }
// Best effort:
uninstallSystemDaemonDarwin(nil)
if err := ioutil.WriteFile(sysPlist, []byte(darwinLaunchdPlist), 0700); err != nil { if err := ioutil.WriteFile(sysPlist, []byte(darwinLaunchdPlist), 0700); err != nil {
return err return err
} }