Release DiscordLyrics 1.0.5

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.5
+
+- Fixed the Windows installer so pnpm warnings no longer get treated as a failed build.
+- Updated command handling to prefer native `.cmd` shims instead of PowerShell package-manager shims.
+
 ## 1.0.4
 
 - Added a Discord-styled progress window for update installs.

SpotifyLyricsStatus.plugin.js

@@ -2,7 +2,7 @@
  * @name DiscordLyrics
  * @author mally
  * @description Sets your Discord custom status to the current synced lyric from Spotify, or a pause status when playback stops.
- * @version 1.0.4
+ * @version 1.0.5
  * @source https://lrclib.net
  */
 
@@ -14,7 +14,7 @@ const { execFile, spawn } = require("child_process");
 module.exports = class DiscordLyrics {
     constructor() {
         this.name = "DiscordLyrics";
-        this.version = "1.0.4";
+        this.version = "1.0.5";
         this.repo = "MallyDev2/DiscordLyrics";
         this.latestReleaseApi = `https://api.github.com/repos/${this.repo}/releases/latest`;
         this.interval = null;

dist/DiscordLyrics-Installer.ps1

@@ -111,13 +111,31 @@ function Resolve-NativeCommand {
         [string]$Command
     )
 
-    $LookupNames = @($Command)
-    if ([System.IO.Path]::GetExtension($Command) -eq "") {
-        $LookupNames = @("$Command.cmd", "$Command.exe", "$Command.bat", $Command)
+    if ([System.IO.Path]::GetExtension($Command) -ne "") {
+        $FoundExact = Get-Command $Command -ErrorAction SilentlyContinue | Where-Object { $_.Source -and $_.Source -notmatch '\.ps1$' } | Select-Object -First 1
+        if ($FoundExact) {
+            return $FoundExact.Source
+        }
+
+        return $Command
+    }
+
+    $Extensions = @(".cmd", ".exe", ".bat", "")
+    foreach ($Directory in ($env:PATH -split [System.IO.Path]::PathSeparator)) {
+        if ([string]::IsNullOrWhiteSpace($Directory)) {
+            continue
+        }
+
+        foreach ($Extension in $Extensions) {
+            $Candidate = Join-Path $Directory "$Command$Extension"
+            if (Test-Path -LiteralPath $Candidate -PathType Leaf) {
+                return $Candidate
+            }
+        }
     }
 
-    foreach ($Name in $LookupNames) {
-        $Found = Get-Command $Name -CommandType Application -ErrorAction SilentlyContinue | Select-Object -First 1
+    foreach ($Name in @("$Command.cmd", "$Command.exe", "$Command.bat", $Command)) {
+        $Found = Get-Command $Name -ErrorAction SilentlyContinue | Where-Object { $_.Source -and $_.Source -notmatch '\.ps1$' } | Select-Object -First 1
         if ($Found) {
             return $Found.Source
         }

dist/SpotifyLyricsStatus.plugin.js

@@ -2,7 +2,7 @@
  * @name DiscordLyrics
  * @author mally
  * @description Sets your Discord custom status to the current synced lyric from Spotify, or a pause status when playback stops.
- * @version 1.0.4
+ * @version 1.0.5
  * @source https://lrclib.net
  */
 
@@ -14,7 +14,7 @@ const { execFile, spawn } = require("child_process");
 module.exports = class DiscordLyrics {
     constructor() {
         this.name = "DiscordLyrics";
-        this.version = "1.0.4";
+        this.version = "1.0.5";
         this.repo = "MallyDev2/DiscordLyrics";
         this.latestReleaseApi = `https://api.github.com/repos/${this.repo}/releases/latest`;
         this.interval = null;

dist/vencord/spotifyLyricsStatus/index.ts

@@ -32,7 +32,7 @@ const DEFAULT_SETTINGS = {
     rpcShowAlbumArt: true
 } as const;
 
-const RELEASE_VERSION = "1.0.4";
+const RELEASE_VERSION = "1.0.5";
 const REPO = "MallyDev2/DiscordLyrics";
 const LATEST_RELEASE_API = `https://api.github.com/repos/${REPO}/releases/latest`;
 const LAST_UPDATE_CHECK_KEY = "DiscordLyrics.lastUpdateCheck";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mallydev2/discordlyrics",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Spotify lyrics status for BetterDiscord and Vencord.",
   "private": false,
   "author": "MallyDev2",

scripts/DiscordLyrics-Installer.ps1

@@ -111,13 +111,31 @@ function Resolve-NativeCommand {
         [string]$Command
     )
 
-    $LookupNames = @($Command)
-    if ([System.IO.Path]::GetExtension($Command) -eq "") {
-        $LookupNames = @("$Command.cmd", "$Command.exe", "$Command.bat", $Command)
+    if ([System.IO.Path]::GetExtension($Command) -ne "") {
+        $FoundExact = Get-Command $Command -ErrorAction SilentlyContinue | Where-Object { $_.Source -and $_.Source -notmatch '\.ps1$' } | Select-Object -First 1
+        if ($FoundExact) {
+            return $FoundExact.Source
+        }
+
+        return $Command
+    }
+
+    $Extensions = @(".cmd", ".exe", ".bat", "")
+    foreach ($Directory in ($env:PATH -split [System.IO.Path]::PathSeparator)) {
+        if ([string]::IsNullOrWhiteSpace($Directory)) {
+            continue
+        }
+
+        foreach ($Extension in $Extensions) {
+            $Candidate = Join-Path $Directory "$Command$Extension"
+            if (Test-Path -LiteralPath $Candidate -PathType Leaf) {
+                return $Candidate
+            }
+        }
     }
 
-    foreach ($Name in $LookupNames) {
-        $Found = Get-Command $Name -CommandType Application -ErrorAction SilentlyContinue | Select-Object -First 1
+    foreach ($Name in @("$Command.cmd", "$Command.exe", "$Command.bat", $Command)) {
+        $Found = Get-Command $Name -ErrorAction SilentlyContinue | Where-Object { $_.Source -and $_.Source -notmatch '\.ps1$' } | Select-Object -First 1
         if ($Found) {
             return $Found.Source
         }

vencord-userplugin/spotifyLyricsStatus/index.ts

@@ -32,7 +32,7 @@ const DEFAULT_SETTINGS = {
     rpcShowAlbumArt: true
 } as const;
 
-const RELEASE_VERSION = "1.0.4";
+const RELEASE_VERSION = "1.0.5";
 const REPO = "MallyDev2/DiscordLyrics";
 const LATEST_RELEASE_API = `https://api.github.com/repos/${REPO}/releases/latest`;
 const LAST_UPDATE_CHECK_KEY = "DiscordLyrics.lastUpdateCheck";