Move parsing 'innosetup' to 'install.ps1'

ScoopInstaller · Jun 12, 2019 · 784edbf · 784edbf
1 parent 4a3293b
commit 784edbf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/lib/install.ps1 b/lib/install.ps1
@@ -34,6 +34,15 @@ function install_app($app, $architecture, $global, $suggested, $use_cache = $tru
         return
     }
 
+    # Change 'innosetup' to 'installer.type:inno'
+    if ($manifest.innosetup) {
+        if ($manifest.installer) {
+            $manifest.installer | Add-Member -MemberType NoteProperty -Name type -Value 'inno'
+        } else {
+            $manifest | Add-Member -MemberType NoteProperty -Name installer -Value @{ type = 'inno' }
+        }
+    }
+
     write-output "Installing '$app' ($version) [$architecture]"
 
     $dir = ensure (versiondir $app $version $global)

diff --git a/lib/manifest.ps1 b/lib/manifest.ps1
@@ -7,15 +7,7 @@ function manifest_path($app, $bucket) {
 
 function parse_json($path) {
     if(!(test-path $path)) { return $null }
-    $json = Get-Content $path -raw -Encoding UTF8 | convertfrom-json -ea stop
-    if ($json.innosetup) {
-        if ($json.installer) {
-            $json.installer | Add-Member -MemberType NoteProperty -Name type -Value 'inno'
-        } else {
-            $json | Add-Member -MemberType NoteProperty -Name installer -Value @{type = 'inno'}
-        }
-    }
-    return ($json | Select-Object -Property * -ExcludeProperty "innosetup")
+    Get-Content $path -raw -Encoding UTF8 | convertfrom-json -ea stop
 }
 
 function url_manifest($url) {
@@ -30,15 +22,7 @@ function url_manifest($url) {
         throw
     }
     if(!$str) { return $null }
-    $json = $str | convertfrom-json
-    if ($json.innosetup) {
-        if ($json.installer) {
-            $json.installer | Add-Member -MemberType NoteProperty -Name type -Value 'inno'
-        } else {
-            $json | Add-Member -MemberType NoteProperty -Name installer -Value @{type = 'inno'}
-        }
-    }
-    return ($json | Select-Object -Property * -ExcludeProperty "innosetup")
+    $str | convertfrom-json
 }
 
 function manifest($app, $bucket, $url) {