ps1 self elevate & minify

.github/workflows/ci.yml

@@ -22,6 +22,9 @@ jobs:
         API_KEY: ${{ secrets.api_key }}
       run: ./build-rpglist.sh "$API_KEY"
 
+    - name: Minify Powershell script
+      uses: StartAutomating/[email protected]
+
     - name: Set date env
       run: echo "TODAY=$(date '+%Y/%m/%d')" >> $GITHUB_ENV
 
@@ -33,4 +36,5 @@ jobs:
         files: |
           rpglist.json
           BlockRpg.ps1
+          BlockRpg.min.ps1
           block-rpg.sh

README.md

@@ -12,7 +12,7 @@
 
 下列两种方法任选其一：
 
-1. Release获取`BlockRpg.ps1`，使用管理员权限执行即可
+1. Release获取`BlockRpg.ps1`，右键使用Powershell执行，如果有提示需要确认，输入R然后回车即可
 2. Release获取`rpglist.json`，导入火绒或者其他类似能提供IP过滤名单的软件即可
 
 ### Linux

build-rpglist.sh

@@ -68,6 +68,11 @@ iplist_ps1=$(cat rpglist.json | jq --raw-output '
 ')
 
 echo '
+if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")) {
+    Start-Process powershell.exe "-NoProfile -ExecutionPolicy Bypass -File `"$PSCommandPath`"" -Verb RunAs
+    exit
+}
+
 $rulename = "Block L4D2 RPG Servers"
 $iplist = @("'"$iplist_ps1"'")
 
@@ -86,7 +91,7 @@ if ( Get-NetFirewallRule -DisplayName $rulename 2>$null ) {
         -RemoteAddress $iplist
 }
 
-echo "Done."
+Read-Host -Prompt "------------- Done. -------------" | Out-Null
 ' \
 > BlockRpg.ps1