powershell updates

diff --git a/_webi/bootstrap.ps1 b/_webi/bootstrap.ps1
index 8ec299c8e685fe0761891df40e2b38e2e1d632cb..168c457ff6a4c4e9b88516e69d7be4d9c8783568 100644 (file)
--- a/_webi/bootstrap.ps1
+++ b/_webi/bootstrap.ps1
@@ -23,14 +23,15 @@ pushd .local\bin
 
 # TODO SetStrictMode
 # TODO Test-Path variable:global:Env:WEBI_HOST ???
-IF(!($Env:WEBI_HOST -eq $null -or $Env:WEBI_HOST -eq "")) {
+IF($Env:WEBI_HOST -eq $null -or $Env:WEBI_HOST -eq "")
 {
     $Env:WEBI_HOST = "https://webinstall.dev"
 }
 
 # Fetch webi.bat
-Invoke-WebRequest "$Env:WEBI_HOST/packages/_webi/webi.ps1.bat" -OutFile webi.bat
-Invoke-WebRequest "$Env:WEBI_HOST/packages/_webi/webi.ps1" -OutFile webi.ps1
+echo "$Env:WEBI_HOST/packages/_webi/webi.ps1"
+curl.exe -s -A "windows" "$Env:WEBI_HOST/packages/_webi/webi.ps1.bat" -o webi.bat
+curl.exe -s -A "windows" "$Env:WEBI_HOST/packages/_webi/webi.ps1" -o webi.ps1
 
 popd
 

diff --git a/_webi/webi.ps1 b/_webi/webi.ps1
index 21a4e957966f794c200d91c58af903b775031c56..1a961fc66dc9863bd771d0ba527d6cc245c93661 100644 (file)
--- a/_webi/webi.ps1
+++ b/_webi/webi.ps1
@@ -30,7 +30,7 @@ if (!(Test-Path -Path .local\tmp))
 
 # TODO SetStrictMode
 # TODO Test-Path variable:global:Env:WEBI_HOST ???
-IF(!$Env:WEBI_HOST)
+IF($Env:WEBI_HOST -eq $null -or $Env:WEBI_HOST -eq "")
 {
     $Env:WEBI_HOST = "https://webinstall.dev"
 }

diff --git a/ssh-utils/ssh-pubkey.ps1 b/ssh-utils/ssh-pubkey.ps1
index 3af6a590af3ffe7d67fb8187393574dc3b00405b..46838e38c12dccabe7dc326c87265392abf186e1 100644 (file)
--- a/ssh-utils/ssh-pubkey.ps1
+++ b/ssh-utils/ssh-pubkey.ps1
@@ -6,23 +6,23 @@
 if (!(Test-Path -Path "$Env:USERPROFILE/.ssh"))
 {
     New-Item -Path "$Env:USERPROFILE/.ssh" -ItemType Directory
-    & icacls "$Env:USERPROFILE/.ssh" /inheritance:r
-    & icacls "$Env:USERPROFILE/.ssh" /grant:r "%username%":"(F)"
+    #& icacls "$Env:USERPROFILE/.ssh" /inheritance:r
+    #& icacls "$Env:USERPROFILE/.ssh" /grant:r "$Env:USERNAME":"(F)"
 }
 
 if (!(Test-Path -Path "$Env:USERPROFILE/.ssh/config"))
 {
     New-Item -Path "$Env:USERPROFILE/.ssh/config" -ItemType "file" -Value ""
-    & icacls "$Env:USERPROFILE/.ssh/config" /inheritance:r
-    & icacls "$Env:USERPROFILE/.ssh/config" /grant:r "%username%":"(F)"
+    #& icacls "$Env:USERPROFILE/.ssh/config" /inheritance:r
+    #& icacls "$Env:USERPROFILE/.ssh/config" /grant:r "$Env:USERNAME":"(F)"
 }
 
-if (!(Test-Path -Path "$Env:USERPROFILE/.ssh/authorized_keys"))
-{
-    New-Item -Path "$Env:USERPROFILE/.ssh/authorized_keys" -ItemType "file" -Value ""
-    & icacls "$Env:USERPROFILE/.ssh/authorized_keys" /inheritance:r
-    & icacls "$Env:USERPROFILE/.ssh/authorized_keys" /grant:r "%username%":"(F)"
-}
+#if (!(Test-Path -Path "$Env:USERPROFILE/.ssh/authorized_keys"))
+#{
+#    New-Item -Path "$Env:USERPROFILE/.ssh/authorized_keys" -ItemType "file" -Value ""
+#    #& icacls "$Env:USERPROFILE/.ssh/authorized_keys" /inheritance:r
+#    #& icacls "$Env:USERPROFILE/.ssh/authorized_keys" /grant:r "$Env:USERNAME":"(F)"
+#}
 
 if (!(Test-Path -Path "$Env:USERPROFILE/.ssh/id_rsa"))
 {

diff --git a/vps-myip/install.ps1 b/vps-myip/install.ps1
index 2cde75ee6a777e0425960d48267b22a148fe7656..0d3c7447cb0d25297ba01a5ed0e58cddd67742a5 100644 (file)
--- a/vps-myip/install.ps1
+++ b/vps-myip/install.ps1
@@ -2,12 +2,14 @@
 
 $ipv4 = curl.exe -sf https://api.ipify.org
 
-IF(!($ipv4 -eq $null -or $ipv4 -eq "")) {
+IF(!($ipv4 -eq $null -or $ipv4 -eq ""))
+{
     echo "IPv4 (A)   : $ipv4"
 }
 
 $ipv6 = curl.exe -sf https://api6.ipify.org
 
-IF(!($ipv6 -eq $null -or $ipv6 -eq "")) {
+IF(!($ipv6 -eq $null -or $ipv6 -eq ""))
+{
     echo "IPv6 (AAAA): $ipv6"
 }