Merge pull request #337 from rcmaehl/main

Rebase?
rcmaehl · Nov 16, 2023 · a621f09 · a621f09
2 parents a84fc0a + a62e2d6
commit a621f09
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 23 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -12,11 +12,8 @@ body:
   attributes:
     label: Preflight Checklist
     options:
-      - label: Microsoft Edge is still installed (see issue 26)
-        required: true
-      - label: Running microsoft-edge:https://google.com redirects successfully
-        required: true
-      - label: Microsoft Edge is selected in any "How do you want to open this?" box (if applicable)
+      - label: Running `microsoft-edge:https://google.com` redirects successfully
+      - label: Microsoft Edge is selected in any "How do you want to open this?" box
 
 - type: dropdown
   attributes:

diff --git a/.github/ISSUE_TEMPLATE/help_request.yml b/.github/ISSUE_TEMPLATE/help_request.yml
@@ -0,0 +1,70 @@
+name: "⁉ Help Request"
+description: It's just not working
+labels: 
+- troubleshooting
+body:
+- type: markdown
+  attributes:
+    value: |
+      Please make sure to [search for existing issues](https://github.com/rcmaehl/MSEdgeRedirect/issues) before filing a new one!
+
+- type: checkboxes
+  attributes:
+    label: Preflight Checklist
+    options:
+      - label: Microsoft Edge is selected in any "How do you want to open this?" box
+      - label: I've ran the [Cleanup tool](https://raw.githubusercontent.com/rcmaehl/MSEdgeRedirect/main/Assets/Cleanup%20Tool.ps1) and tried another install
+
+- type: dropdown
+  attributes:
+    label: Install Type
+    description: How was MSEdgeRedirect Installed / Updated
+    multiple: false
+    options:
+      - New Install
+      - Manual Update
+      - New Deployment (Chocolatey, Winget, Etc)
+      - Managed Update (Chocolatey, Winget, Etc)
+  validations:
+    required: true
+
+- type: dropdown
+  attributes:
+    label: Install Mode
+    description: Which Mode is selected during install?
+    multiple: false
+    options:
+      - Active Mode
+      - Service Mode
+      - Unsure
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: ℹ Behavior
+    description: We highly suggest including screenshots and logs (%localappdata%\MSEdgeRedirect\logs).
+    placeholder: What isn't working?
+  validations:
+    required: false
+
+- type: input
+  attributes:
+    label: Microsoft Windows version
+    placeholder: |
+      "20H2 Build 19042"
+    description: |
+      Run Winver from Run (Win+R) or Start Menu
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Other Software
+    description: If you're reporting a bug about our interaction with other software, what software? What versions?
+    placeholder: |
+      vim 8.2 (inside WSL)
+      OpenSSH_for_Windows_8.1p1
+      My Cool Application v0.3 (include a code snippet if it would help!)
+  validations:
+    required: false
diff --git a/.github/workflows/MSER.yml b/.github/workflows/MSER.yml
@@ -18,7 +18,7 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Cache tools
         uses: actions/cache@v3
         id: cache

diff --git a/.github/workflows/chocolatey-package.yml b/.github/workflows/chocolatey-package.yml
@@ -16,7 +16,7 @@ jobs:
     if: github.repository == 'rcmaehl/MSEdgeRedirect'
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - uses: oprypin/find-latest-tag@v1
         with:
           repository: rcmaehl/MSEdgeRedirect  # The repository to scan.
@@ -34,13 +34,21 @@ jobs:
         id: version
         run: |
           version=${{ steps.latesttag.outputs.tag }}
-          echo "::set-output name=nuget::$version"
+          echo "nuget=$version" >> $GITHUB_OUTPUT
           sed -i "s/{VERSION}/${version}/g" "Assets/Choco/MSEdgeRedirect/msedgeredirect.nuspec"
+      - name: Choco Downgrade
+        uses: crazy-max/ghaction-chocolatey@v3
+        with:
+          args: install chocolatey --version=1.2.1 --allow-downgrade -y -r --no-progress
       - name: Pack Release
-        uses: crazy-max/ghaction-chocolatey@v1
+        uses: crazy-max/ghaction-chocolatey@v3
         with:
           args: pack Assets/Choco/MSEdgeRedirect/msedgeredirect.nuspec --outputdirectory Assets/Choco/MSEdgeRedirect
+      - name: Choco Upgrade
+        uses: crazy-max/ghaction-chocolatey@v3
+        with:
+          args: upgrade chocolatey
       - name: Upload Release
-        uses: crazy-max/ghaction-chocolatey@v1
+        uses: crazy-max/ghaction-chocolatey@v3
         with:
           args: push Assets/Choco/MSEdgeRedirect/msedgeredirect.${{ steps.version.outputs.nuget }}.nupkg -s https://push.chocolatey.org/ -k ${{ secrets.CHOCO_KEY }}
diff --git a/.github/workflows/winget-submission.yml b/.github/workflows/winget-submission.yml
@@ -12,12 +12,12 @@ on:
 
 jobs:
   publish:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
-      - uses: vedantmgoyal2009/winget-releaser@v1
+      - uses: vedantmgoyal2009/winget-releaser@v2
         with:
           identifier: rcmaehl.MSEdgeRedirect
-          version: ${{ inputs.tag_name || github.release.tag_name }}
-          release-tag: ${{ inputs.tag_name || github.release.tag_name }}
+          version: ${{ inputs.tag_name || github.event.release.tag_name }}
+          release-tag: ${{ inputs.tag_name || github.event.release.tag_name }}
           delete-previous-version: 'true'
           token: ${{ secrets.MSEdgeRedirect_PAT }}
diff --git a/MSEdgeRedirect.au3 b/MSEdgeRedirect.au3
@@ -546,8 +546,12 @@ Func _DecodeAndRun($sEdge = $aEdges[1], $sCMDLine = "")
 	Local $aCMDLine
 
 	Select
-		Case StringLeft($sCMDLine, 2) = "--" And _GetSettingValue("RunUnsafe")
-			_SafeRun($sEdge, $sCMDLine)
+		Case StringLeft($sCMDLine, 2) = "--"
+			If _GetSettingValue("RunUnsafe") Then
+				_SafeRun($sEdge, $sCMDLine)
+			Else
+				FileWrite($hLogs[$AppSecurity], _NowCalc() & " - " & "Blocked Unsafe Flag: " & $sCMDLine & @CRLF)
+			EndIf
 		Case StringInStr($sCMDLine, "--default-search-provider=?")
 			FileWrite($hLogs[$URIFailures], _NowCalc() & " - Skipped Settings URL: " & $sCMDLine & @CRLF)
 		Case StringInStr($sCMDLine, "profiles_settings")

diff --git a/README.md b/README.md
@@ -1,5 +1,3 @@
-<!---[![Build Status](https://img.shields.io/github/workflow/status/rcmaehl/MSEdgeRedirect/mser)](https://github.com/rcmaehl/MSEdgeRedirect/actions?query=workflow%3Amser)
-[![Download](https://img.shields.io/github/v/release/rcmaehl/MSEdgeRedirect)](https://github.com/rcmaehl/MSEdgeRedirect/releases/latest/)--->
 [![Latest download count](https://img.shields.io/github/downloads/rcmaehl/MSEdgeRedirect/latest/total)](https://github.com/rcmaehl/MSEdgeRedirect/releases/latest/)
 [![Chocolatey download count](https://img.shields.io/chocolatey/dt/msedgeredirect?label=Chocolatey+downloads)](https://chocolatey.org/packages/msedgeredirect)
 [![Ko-fi](https://img.shields.io/badge/Support%20me%20on-Ko--fi-FF5E5B.svg?logo=ko-fi)](https://ko-fi.com/rcmaehl)
@@ -25,7 +23,7 @@ Looking to Disable Web Search Entirely? Try [@krlvm](https://github.com/krlvm)'s
 
 Download Stable (GitHub)|Download Testing (GitHub)
 ----|----
-<a href="https://github.com/rcmaehl/MSEdgeRedirect/releases/latest/download/MSEdgeRedirect.exe"><img src="https://img.shields.io/github/v/release/rcmaehl/msedgeredirect?display_name=tag&style=for-the-badge" height="45px" /></a>|<a href="https://nightly.link/rcmaehl/MSEdgeRedirect/workflows/MSER/main/mser.zip"><img src="https://img.shields.io/github/workflow/status/rcmaehl/MSEdgeRedirect/mser?style=for-the-badge" height="45px" /></a>
+<a href="https://github.com/rcmaehl/MSEdgeRedirect/releases/latest/download/MSEdgeRedirect.exe"><img src="https://img.shields.io/github/v/release/rcmaehl/msedgeredirect?display_name=tag&style=for-the-badge" height="45px" /></a>|<a href="https://nightly.link/rcmaehl/MSEdgeRedirect/workflows/MSER/0.8.0.0-dev/mser.zip"><img src="https://img.shields.io/github/actions/workflow/status/rcmaehl/MSEdgeRedirect/MSER.yml?branch=0.8.0.0-dev&style=for-the-badge" height="45px" /></a>
 
 ### Package Managers
 
@@ -74,14 +72,20 @@ Run `microsoft-edge:https://google.com` using the `Windows` + `R` keys. If that
 
 ### Will searches inside \<app name here\> still use Bing?
 
-MSEdge Redirect only redirects links that attempt to open in MS Edge. It will not affect results generated within other applications.
+MSEdgeRedirect only redirects links that attempt to open in MS Edge. It will not affect results generated within other applications.
 
 ### Can you change Bing results to Google Results?
 
 Yes, as of 0.5.0.0, you can select One of 8 available Search Engines, or set your own!
 
 ### How do I uninstall?
 
-Regular Install|Chocolatey|Scoop|Winget
-----|----|----|----
-Use Programs and Features|`choco uninstall msedgeredirect`|`scoop uninstall msedgeredirect`|`winget uninstall MSEdgeRedirect`
+#### Normal Installs
+Regular Install|Corrupted Install
+----|----
+Use Programs and Features|[Cleanup Tool](https://raw.githubusercontent.com/rcmaehl/MSEdgeRedirect/main/Assets/Cleanup%20Tool.ps1)
+
+#### Package Managers
+Chocolatey|Scoop|Winget
+----|----|----
+`choco uninstall msedgeredirect`|`scoop uninstall msedgeredirect`|`winget uninstall MSEdgeRedirect`