Skip to content

Commit d4fd277

Browse files
committed
fix uninstall
1 parent a802fdb commit d4fd277

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

pkg/cmd/deregister/deregister.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,16 @@ func runDeregister(ctx context.Context, t *terminal.Terminal, s DeregisterStore,
100100
return fmt.Errorf("sudo issue: %w", err)
101101
}
102102

103-
// Ensure user is logged in before any steps (login/email prompt happens here if needed).
104-
if _, err := s.GetCurrentUser(); err != nil {
105-
return breverrors.WrapAndTrace(err)
106-
}
107-
108103
reg, err := deps.registrationStore.Load()
109104
if err != nil {
110105
return err
111106
}
112107

108+
// Only prompt for login when there is a device to deregister.
109+
if _, err := s.GetCurrentUser(); err != nil {
110+
return breverrors.WrapAndTrace(err)
111+
}
112+
113113
orgName := reg.OrgName
114114
if orgName == "" {
115115
orgName = "(unknown)"

pkg/cmd/register/netbird.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ if [ -f /etc/netbird/install.conf ]; then
5252
fi
5353
5454
case "$PKG_MGR" in
55-
apt) sudo apt-get remove -y netbird ;;
56-
dnf) sudo dnf remove -y netbird ;;
57-
yum) sudo yum remove -y netbird ;;
55+
apt) sudo apt-get remove -y netbird || true ;;
56+
dnf) sudo dnf remove -y netbird || true ;;
57+
yum) sudo yum remove -y netbird || true ;;
5858
*) sudo rm -f /usr/bin/netbird /usr/local/bin/netbird ;;
5959
esac
6060
6161
sudo rm -rf /etc/netbird
6262
sudo rm -rf /var/lib/netbird
63-
sudo rm /usr/local/bin/netbird # should be redundant with uninstalls, but for safety
63+
sudo rm -f /usr/bin/netbird /usr/local/bin/netbird
6464
`
6565

6666
cmd := exec.Command("bash", "-c", script) // #nosec G204

0 commit comments

Comments
 (0)