Fix Standalone and Source detection

ScoopInstaller · Sep 20, 2024 · 58a5ead · 58a5ead
1 parent c38fc63
commit 58a5ead
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/lib/manifest.ps1 b/lib/manifest.ps1
@@ -87,7 +87,7 @@ function Get-Manifest($app) {
                 if (Test-Path $app) {
                     $url = Convert-Path $app
                     $app = appname_from_url $url
-                    $manifest = url_manifest $url
+                    $manifest = parse_json $url
                 } else {
                     if (($app -match '\\/') -or $app.EndsWith('.json')) { $url = $app }
                     $app = appname_from_url $app

diff --git a/libexec/scoop-info.ps1 b/libexec/scoop-info.ps1
@@ -32,19 +32,22 @@ $manifest_file = if ($bucket) {
     $url
 }
 
-if ($install.url -and (Test-Path $original_app) -or ($original_app -match '^(ht|f)tps?://|\\\\')) {
+# Standalone and Source detection
+if ((Test-Path $original_app) -or ($original_app -match '^(ht|f)tps?://|\\\\')) {
     $standalone = $true
     if (Test-Path $original_app) {
         $original_app = (Get-AbsolutePath "$original_app")
     }
-    if (Test-Path $install.url) {
-        $install_url = (Get-AbsolutePath $install.url)
-    } else {
-        $install_url = $install.url
+    if ($install.url) {
+        if (Test-Path $install.url) {
+            $install_url = (Get-AbsolutePath $install.url)
+        } else {
+            $install_url = $install.url
+        }
+    }
+    if ($original_app -eq $install_url) {
+        $same_source = $true
     }
-}
-if ($original_app -eq $install_url) {
-    $same_source = $true
 }
 
 if ($verbose) {