fix: Function placement

Ash258 · Oct 17, 2021 · 6d65a20 · 6d65a20
1 parent 7255a0c
commit 6d65a20
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 48 deletions.
diff --git a/lib/Applications.ps1 b/lib/Applications.ps1
@@ -201,3 +201,51 @@ function app_status($app, $global) {
 
     return $status
 }
+
+function Confirm-InstallationStatus {
+    <#
+    .SYNOPSIS
+        Get status of specific applications.
+        Returns array of 3 item arrays (appliation name, globally installed, bucket name)
+    .PARAMETER Apps
+        Specifies the array of applications to be evalueated.
+    .PARAMETER Global
+        Specifies to check globally installed applications.
+    #>
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory)]
+        [String[]] $Apps,
+        [Switch] $Global
+    )
+    $Global | Out-Null # PowerShell/PSScriptAnalyzer#1472
+    $installed = @()
+
+    $Apps | Select-Object -Unique | Where-Object -Property 'Name' -NE -Value 'scoop' | ForEach-Object {
+        # TODO: Adopt Resolve-ManifestInformation
+        # Should not be needed to resolve, as it will contain only valid installed applications
+        $app, $null, $null = parse_app $_
+        $buc = (app_status $app $Global).bucket
+        if ($Global) {
+            if (installed $app $true) {
+                $installed += , @($app, $true, $buc)
+            } elseif (installed $app $false) {
+                Write-UserMessage -Message "'$app' isn't installed globally, but it is installed for your account." -Err
+                Write-UserMessage -Message 'Try again without the --global (or -g) flag instead.' -Warning
+            } else {
+                Write-UserMessage -Message "'$app' isn't installed." -Err
+            }
+        } else {
+            if (installed $app $false) {
+                $installed += , @($app, $false, $buc)
+            } elseif (installed $app $true) {
+                Write-UserMessage -Message "'$app' isn't installed for your account, but it is installed globally." -Err
+                Write-UserMessage -Message 'Try again with the --global (or -g) flag instead.' -Warning
+            } else {
+                Write-UserMessage -Message "'$app' isn't installed." -Err
+            }
+        }
+    }
+
+    return , $installed
+}
diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -812,54 +812,6 @@ function ensure_architecture($architecture_opt) {
     }
 }
 
-function Confirm-InstallationStatus {
-    <#
-    .SYNOPSIS
-        Get status of specific applications.
-        Returns array of 3 item arrays (appliation name, globally installed, bucket name)
-    .PARAMETER Apps
-        Specifies the array of applications to be evalueated.
-    .PARAMETER Global
-        Specifies to check globally installed applications.
-    #>
-    [CmdletBinding()]
-    param(
-        [Parameter(Mandatory)]
-        [String[]] $Apps,
-        [Switch] $Global
-    )
-    $Global | Out-Null # PowerShell/PSScriptAnalyzer#1472
-    $installed = @()
-
-    $Apps | Select-Object -Unique | Where-Object -Property 'Name' -NE -Value 'scoop' | ForEach-Object {
-        # TODO: Adopt Resolve-ManifestInformation
-        # Should not be needed to resolve, as it will contain only valid installed applications
-        $app, $null, $null = parse_app $_
-        $buc = (app_status $app $Global).bucket
-        if ($Global) {
-            if (installed $app $true) {
-                $installed += , @($app, $true, $buc)
-            } elseif (installed $app $false) {
-                Write-UserMessage -Message "'$app' isn't installed globally, but it is installed for your account." -Err
-                Write-UserMessage -Message 'Try again without the --global (or -g) flag instead.' -Warning
-            } else {
-                Write-UserMessage -Message "'$app' isn't installed." -Err
-            }
-        } else {
-            if (installed $app $false) {
-                $installed += , @($app, $false, $buc)
-            } elseif (installed $app $true) {
-                Write-UserMessage -Message "'$app' isn't installed for your account, but it is installed globally." -Err
-                Write-UserMessage -Message 'Try again with the --global (or -g) flag instead.' -Warning
-            } else {
-                Write-UserMessage -Message "'$app' isn't installed." -Err
-            }
-        }
-    }
-
-    return , $installed
-}
-
 function strip_path($orig_path, $dir) {
     if ($null -eq $orig_path) { $orig_path = '' }
     $stripped = [string]::join(';', @( $orig_path.split(';') | Where-Object { $_ -and $_ -ne $dir } ))

diff --git a/libexec/scoop-cleanup.ps1 b/libexec/scoop-cleanup.ps1
@@ -14,6 +14,7 @@
     @('getopt', 'Resolve-GetOpt'),
     @('help', 'scoop_help'),
     @('Helpers', 'New-IssuePrompt'),
+    @('Applications', 'Get-InstalledApplicationInformation'),
     @('buckets', 'Get-KnownBucket'),
     @('install', 'install_app'),
     @('manifest', 'Resolve-ManifestInformation'),

diff --git a/libexec/scoop-info.ps1 b/libexec/scoop-info.ps1
@@ -10,6 +10,7 @@
     @('getopt', 'Resolve-GetOpt'),
     @('help', 'scoop_help'),
     @('Helpers', 'New-IssuePrompt'),
+    @('Applications', 'Get-InstalledApplicationInformation'),
     @('buckets', 'Get-KnownBucket'),
     @('depends', 'script_deps'),
     @('install', 'install_app'),

diff --git a/libexec/scoop-uninstall.ps1 b/libexec/scoop-uninstall.ps1
@@ -13,6 +13,7 @@
     @('help', 'scoop_help'),
     @('Helpers', 'New-IssuePrompt'),
     @('install', 'install_app'),
+    @('Applications', 'Get-InstalledApplicationInformation'),
     @('manifest', 'Resolve-ManifestInformation'),
     @('psmodules', 'install_psmodule'),
     @('shortcuts', 'rm_startmenu_shortcuts'),

diff --git a/libexec/scoop-update.ps1 b/libexec/scoop-update.ps1
@@ -19,6 +19,7 @@
     @('getopt', 'Resolve-GetOpt'),
     @('help', 'scoop_help'),
     @('Helpers', 'New-IssuePrompt'),
+    @('Applications', 'Get-InstalledApplicationInformation'),
     @('depends', 'script_deps'),
     @('install', 'install_app'),
     @('manifest', 'Resolve-ManifestInformation'),