Move applist() from update/cleanup commad to core

CyberFlameGO · Aug 30, 2017 · 9b3e7c8 · 9b3e7c8
1 parent 8f1f7d9
commit 9b3e7c8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -337,6 +337,11 @@ function reset_aliases() {
     $default_aliases.keys | % { reset_alias $_ $default_aliases[$_] }
 }
 
+# convert list of apps to list of ($app, $global) tuples
+function applist($apps, $global) {
+    return ,@($apps |% { ,@($_, $global) })
+}
+
 function app($app) {
     $app = [string]$app
     if($app -notmatch '^((ht)|f)tps?://') {

diff --git a/libexec/scoop-cleanup.ps1 b/libexec/scoop-cleanup.ps1
@@ -63,10 +63,6 @@ function ensure_all_installed($apps, $global) {
     }
 }
 
-# convert list of apps to list of ($app, $global) tuples
-function applist($apps, $global) {
-    return , @($apps | % { , @($_, $global) })
-}
 if($apps) {
     if ($apps -eq '*') {
         $apps = applist (installed_apps $false) $false

diff --git a/libexec/scoop-update.ps1 b/libexec/scoop-update.ps1
@@ -191,11 +191,6 @@ function ensure_all_installed($apps, $global) {
     }
 }
 
-# convert list of apps to list of ($app, $global) tuples
-function applist($apps, $global) {
-    return ,@($apps |% { ,@($_, $global) })
-}
-
 if(!$apps) {
     if($global) {
         "scoop update: --global is invalid when <app> is not specified."; exit 1