diff --git a/netclient/functions/mqhandlers.go b/netclient/functions/mqhandlers.go index a5f1a323..d8a93c2e 100644 --- a/netclient/functions/mqhandlers.go +++ b/netclient/functions/mqhandlers.go @@ -144,7 +144,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) { if newNode.DNSOn != "yes" && shouldDNSChange && nodeCfg.Node.Interface != "" { ncutils.Log("settng DNS off") if err := removeHostDNS(ncutils.IsWindows()); err != nil { - ncutils.Log("error removing netmaker profile from /etc/hosts " + dataErr.Error()) + ncutils.Log("error removing netmaker profile from /etc/hosts " + err.Error()) } // _, err := ncutils.RunCmd("/usr/bin/resolvectl revert "+nodeCfg.Node.Interface, true) // if err != nil { @@ -205,7 +205,7 @@ func UpdatePeers(client mqtt.Client, msg mqtt.Message) { } } else { if err := removeHostDNS(ncutils.IsWindows()); err != nil { - ncutils.Log("error removing netmaker profile from /etc/hosts " + dataErr.Error()) + ncutils.Log("error removing netmaker profile from /etc/hosts " + err.Error()) return } } diff --git a/scripts/netclient-install.ps1 b/scripts/netclient-install.ps1 index e9b16a8e..1c65a8de 100644 --- a/scripts/netclient-install.ps1 +++ b/scripts/netclient-install.ps1 @@ -30,7 +30,7 @@ new-module -name netclient-install -scriptblock { If(-Not $installed) { Quit "Could not install WireGuard" } else { - $env:Path += (";" + $env:ProgramFiles + "\WireGuard") + # $env:Path += (";" + $env:ProgramFiles + "\WireGuard") Write-Host "'$software' is installed." } } else { @@ -48,7 +48,7 @@ new-module -name netclient-install -scriptblock { $loc = Get-Location Copy-Item -Path "$env:userprofile\Downloads\netclient.exe" -Destination "$loc\netclient.exe" } - $runNum = "one","two" + $runNum = "one" foreach ($run in $runNum) { $NetArgs = @("join","-t",$token) @@ -65,11 +65,13 @@ new-module -name netclient-install -scriptblock { $env:Path += ";C:\ProgramData\Netclient\bin" } } - if($run -eq "one"){ - Write-Host "re-running setup to confirm all components are installed." - Start-Sleep -s 1 - } + #if($run -eq "one"){ + # Write-Host "re-running setup to confirm all components are installed." + # Start-Sleep -s 1 + #} + } + Start-Sleep -s 5 Write-Host "'netclient' is installed." } }