working on issues with windows and hosts editing

internal/cmd/apply.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"fmt"
 	"os/exec"
-	"runtime"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -12,7 +11,6 @@ import (
 	"github.com/craftcms/nitro/config"
 	"github.com/craftcms/nitro/internal/find"
 	"github.com/craftcms/nitro/internal/nitro"
-	"github.com/craftcms/nitro/internal/runas"
 	"github.com/craftcms/nitro/internal/scripts"
 	"github.com/craftcms/nitro/internal/task"
 	"github.com/craftcms/nitro/internal/webroot"
@@ -125,12 +123,7 @@ var applyCommand = &cobra.Command{
 			return nil
 		}
 
-		// if this is windows, its always root - we should clean this up eventually
-		if runtime.GOOS == "windows" {
-			return hostsCommand.RunE(cmd, args)
-		}
-
-		return runas.Elevated(machine, []string{"hosts"})
+		return hostsCommand.RunE(cmd, args)
 	},
 }
 

internal/cmd/destroy.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"runtime"
 	"strings"
 	"time"
 
@@ -19,7 +18,6 @@ import (
 	"github.com/craftcms/nitro/datetime"
 	"github.com/craftcms/nitro/internal/helpers"
 	"github.com/craftcms/nitro/internal/nitro"
-	"github.com/craftcms/nitro/internal/runas"
 	"github.com/craftcms/nitro/internal/scripts"
 )
 
@@ -209,18 +207,9 @@ var destroyCommand = &cobra.Command{
 			return nil
 		}
 
-		cmds := []string{"hosts", "remove"}
-		for _, domain := range domains {
-			cmds = append(cmds, domain)
-		}
-
 		fmt.Println("Removing sites from your hosts file.")
 
-		if runtime.GOOS == "windows" {
-			return hostsRemoveCommand.RunE(cmd, cmds)
-		}
-
-		return runas.Elevated(machine, cmds)
+		return hostsRemoveCommand.RunE(cmd, domains)
 	},
 }
 

internal/cmd/hosts.go

@@ -3,11 +3,12 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"os"
-
+	"github.com/craftcms/nitro/internal/runas"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/txn2/txeh"
+	"os"
+	"runtime"
 
 	"github.com/craftcms/nitro/config"
 	"github.com/craftcms/nitro/internal/hosts"
@@ -21,6 +22,12 @@ var hostsCommand = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		machine := flagMachineName
 
+		if runtime.GOOS != "windows" {
+			if err := runas.Elevated(machine, args); err != nil {
+				return err
+			}
+		}
+
 		if !flagDebug {
 			uid := os.Geteuid()
 			if (uid != 0) && (uid != -1) {

internal/cmd/hosts_remove.go

@@ -19,7 +19,7 @@ var hostsRemoveCommand = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if !flagDebug {
 			uid := os.Geteuid()
-			if uid != 0 {
+			if (uid != 0) && (uid != -1) {
 				return errors.New("you do not appear to be running this command as root, so we cannot modify your hosts file")
 			}
 		}

internal/cmd/init.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/craftcms/nitro/config"
 	"github.com/craftcms/nitro/internal/nitro"
-	"github.com/craftcms/nitro/internal/runas"
 	"github.com/craftcms/nitro/internal/suggest"
 	"github.com/craftcms/nitro/validate"
 )
@@ -229,14 +228,8 @@ var initCommand = &cobra.Command{
 
 		// if there are sites, edit the hosts file
 		if len(sites) > 0 {
-			if runtime.GOOS == "windows" {
-				if err := hostsCommand.RunE(cmd, args); err != nil {
-					fmt.Println("Unable to edit the hosts file, please edit it manually or run `nitro apply`")
-				}
-			} else {
-				if err := runas.Elevated(machine, []string{"hosts"}); err != nil {
-					fmt.Println("Unable to edit the hosts file, please edit it manually or run `nitro apply`")
-				}
+			if err := hostsCommand.RunE(cmd, args); err != nil {
+				return err
 			}
 		}
 

internal/cmd/remove.go

@@ -82,7 +82,7 @@ var removeCommand = &cobra.Command{
 		}
 		// END HACK
 
-		applyChanges, err := p.Confirm("Apply changes from config now", &prompt.InputOptions{
+		apply, err := p.Confirm("Apply changes from config now", &prompt.InputOptions{
 			Default:   "yes",
 			Validator: nil,
 			AppendQuestionMark: true,
@@ -91,7 +91,7 @@ var removeCommand = &cobra.Command{
 			return err
 		}
 
-		if applyChanges {
+		if apply {
 			fmt.Println("Applying changes from the config file...")
 			return applyCommand.RunE(cmd, args)
 		}