From eefa55310009fced20117b8e427c88b4915a6f7a Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Fri, 6 Nov 2020 20:20:15 +0300 Subject: [PATCH] Pull request: - isdelve: remove unused package Merge in DNS/adguard-home from remove-isdelve to master Squashed commit of the following: commit aa305fa46713b39a8299754e8fd557cbadcb7cc3 Author: Ainar Garipov Date: Fri Nov 6 18:06:07 2020 +0300 - isdelve: remove unused package --- internal/home/home.go | 7 +------ internal/isdelve/delve.go | 5 ----- internal/isdelve/doc.go | 3 --- internal/isdelve/nodelve.go | 5 ----- 4 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 internal/isdelve/delve.go delete mode 100644 internal/isdelve/doc.go delete mode 100644 internal/isdelve/nodelve.go diff --git a/internal/home/home.go b/internal/home/home.go index bd800b04..178de4a7 100644 --- a/internal/home/home.go +++ b/internal/home/home.go @@ -26,8 +26,6 @@ import ( "github.com/AdguardTeam/AdGuardHome/internal/update" "github.com/AdguardTeam/AdGuardHome/internal/util" - "github.com/AdguardTeam/AdGuardHome/internal/isdelve" - "github.com/AdguardTeam/AdGuardHome/internal/dhcpd" "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" "github.com/AdguardTeam/AdGuardHome/internal/dnsforward" @@ -357,10 +355,7 @@ func checkPermissions() { // On Windows we need to have admin rights to run properly admin, _ := util.HaveAdminRights() - if // noinspection ALL - admin || isdelve.Enabled { - // Don't forget that for this to work you need to add "delve" tag explicitly - // https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program + if admin { return } diff --git a/internal/isdelve/delve.go b/internal/isdelve/delve.go deleted file mode 100644 index bc9a647e..00000000 --- a/internal/isdelve/delve.go +++ /dev/null @@ -1,5 +0,0 @@ -// +build delve - -package isdelve - -const Enabled = true diff --git a/internal/isdelve/doc.go b/internal/isdelve/doc.go deleted file mode 100644 index 862b10d0..00000000 --- a/internal/isdelve/doc.go +++ /dev/null @@ -1,3 +0,0 @@ -// Package isdelve is for checking if we're debugging: -// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program -package isdelve diff --git a/internal/isdelve/nodelve.go b/internal/isdelve/nodelve.go deleted file mode 100644 index 2b06a17c..00000000 --- a/internal/isdelve/nodelve.go +++ /dev/null @@ -1,5 +0,0 @@ -// +build !delve - -package isdelve - -const Enabled = false