Merge branch 'master' into u/cimryan/fix_errors_on_startup

This commit is contained in:
cimryan
2018-10-22 19:47:08 -07:00
3 changed files with 15 additions and 14 deletions

View File

@@ -44,14 +44,18 @@ if ([System.IO.File]::Exists("$wpaSupplicantConfPath")) {
del "$wpaSupplicantConfPath"
}
"ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev`
update_config=1`
`
network={`
ssid=`"$wifiSSID`"`
psk=`"$wifiPSK`"`
key_mgmt=WPA-PSK`
}`
" | Out-File -FilePath "$wpaSupplicantConfPath" -Encoding utf8
$wpaSupplicantConfContent=@"
ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
update_config=1
network={
ssid="$wifiSSID"
psk="$wifiPSK"
}
"@
$utf8 = New-Object System.Text.UTF8Encoding $false
Set-Content -Value $utf8.GetBytes($wpaSupplicantConfContent) -Encoding Byte -Path "$wpaSupplicantConfPath"
Write-Verbose "All done."

View File

@@ -4,7 +4,6 @@ REPO=cimryan
BRANCH=master
user_enabled_pushover=false
if ! [ $(id -u) = 0 ]
then
echo "STOP: Run sudo -i."
@@ -43,8 +42,6 @@ function check_pushover_enabled () {
fi
}
check_pushover_enabled
function check_archive_server_reachable () {
echo "Verifying that the archive server $archiveserver is reachable..."
local serverunreachable=false