refactor to use libexec instead of lib/cmd

blzjns · Jul 2, 2013 · f73e96b · f73e96b
1 parent 26297be
commit f73e96b
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 29 deletions.
diff --git a/bin/refresh.ps1 b/bin/refresh.ps1
@@ -8,7 +8,7 @@ $dest = ensure (versiondir 'scoop' 'current')
 if("$src" -eq "$dest") { abort "$(strip_ext $myinvocation.mycommand.name) is for development only" }
 
 'copying files...'
-cp "$src\*" $dest -recurse -force -exclude '.git', 'tests'
+robocopy $src $dest /mir /njh /njs /nfl /ndl /xd .git /xf .DS_Store
 
 echo 'creating shim...'
 shim "$dest\bin\scoop.ps1"

diff --git a/lib/commands.ps1 b/lib/commands.ps1
@@ -1,5 +1,5 @@
 function command_files {
-	gci (resolve 'cmd') | where { $_.name.endswith('.ps1') }
+	gci (resolve '..\libexec') | where { $_.name.endswith('.ps1') }
 }
 
 function commands {
@@ -9,5 +9,5 @@ function commands {
 function command_name($filename) { $filename.name -replace '\.ps1$', '' }
 
 function exec($cmd, $arguments) {
-	& (resolve "cmd\$cmd.ps1") @arguments
+	& (resolve "..\libexec\$cmd.ps1") @arguments
 }
diff --git a/lib/cmd/help.ps1 → libexec/help.ps1 b/lib/cmd/help.ps1 → libexec/help.ps1
@@ -2,9 +2,9 @@
 # Summary: Show help for a command
 param($cmd)
 
-. "$(split-path $myinvocation.mycommand.path)\..\core.ps1"
-. (resolve ..\commands.ps1)
-. (resolve ..\help.ps1)
+. "$(split-path $myinvocation.mycommand.path)\..\lib\core.ps1"
+. (resolve ..\lib\commands.ps1)
+. (resolve ..\lib\help.ps1)
 
 function print_help($cmd) {
 	$file = gc (resolve ".\$cmd.ps1") -raw

diff --git a/lib/cmd/install.ps1 → libexec/install.ps1 b/lib/cmd/install.ps1 → libexec/install.ps1
@@ -7,11 +7,11 @@
 #      scoop install runat https://raw.github.com/lukesampson/scoop/master/bucket/runat.json
 param($app, $url, $architecture)
 
-. "$(split-path $myinvocation.mycommand.path)\..\core.ps1"
-. (resolve ..\manifest.ps1)
-. (resolve ..\install.ps1)
-. (resolve ..\versions.ps1)
-. (resolve ..\help.ps1)
+. "$(split-path $myinvocation.mycommand.path)\..\lib\core.ps1"
+. (resolve ..\lib\manifest.ps1)
+. (resolve ..\lib\install.ps1)
+. (resolve ..\lib\versions.ps1)
+. (resolve ..\lib\help.ps1)
 
 switch($architecture) {
 	'' { $architecture = architecture }

diff --git a/lib/cmd/list.ps1 → libexec/list.ps1 b/lib/cmd/list.ps1 → libexec/list.ps1
@@ -2,9 +2,9 @@
 # Summary: List installed apps
 # Help: Lists all installed apps
 
-. "$(split-path $myinvocation.mycommand.path)\..\core.ps1"
-. (resolve '..\versions.ps1')
-. (resolve '..\manifest.ps1')
+. "$(split-path $myinvocation.mycommand.path)\..\lib\core.ps1"
+. (resolve '..\lib\versions.ps1')
+. (resolve '..\lib\manifest.ps1')
 
 $apps = installed_apps
 

diff --git a/lib/cmd/search.ps1 → libexec/search.ps1 b/lib/cmd/search.ps1 → libexec/search.ps1
@@ -5,11 +5,11 @@
 # If used with [query], shows app names that match the query.
 # Without [query], shows all the available apps.
 param($query)
-. "$(split-path $myinvocation.mycommand.path)\..\core.ps1"
-. (resolve '..\manifest.ps1')
-. (resolve '..\versions.ps1')
+. "$(split-path $myinvocation.mycommand.path)\..\lib\core.ps1"
+. (resolve '..\lib\manifest.ps1')
+. (resolve '..\lib\versions.ps1')
 
-$bucket = resolve '..\..\bucket'
+$bucket = resolve '..\bucket'
 $apps = apps_in_bucket $bucket
 
 if($query) { $apps = $apps | ? { $_ -like "*$query*" } }

diff --git a/lib/cmd/uninstall.ps1 → libexec/uninstall.ps1 b/lib/cmd/uninstall.ps1 → libexec/uninstall.ps1
@@ -3,11 +3,11 @@
 # Help: e.g. scoop uninstall git
 param($app)
 
-. "$(split-path $myinvocation.mycommand.path)\..\core.ps1"
-. (resolve ../manifest.ps1)
-. (resolve ../help.ps1)
-. (resolve ../install.ps1)
-. (resolve ../versions.ps1)
+. "$(split-path $myinvocation.mycommand.path)\..\lib\core.ps1"
+. (resolve ..\lib\manifest.ps1)
+. (resolve ..\lib\help.ps1)
+. (resolve ..\lib\install.ps1)
+. (resolve ..\lib\versions.ps1)
 
 if(!$app) { 'ERROR: <app> missing'; my_usage; exit 1 }
 

diff --git a/lib/cmd/update.ps1 → libexec/update.ps1 b/lib/cmd/update.ps1 → libexec/update.ps1
@@ -4,10 +4,10 @@
 # 'scoop update [app]' installs a new version of that app, if there is one.
 param($app)
 
-. "$(split-path $myinvocation.mycommand.path)\..\core.ps1"
-. (resolve ..\install.ps1)
-. (resolve ..\manifest.ps1)
-. (resolve ..\versions.ps1)
+. "$(split-path $myinvocation.mycommand.path)\..\lib\core.ps1"
+. (resolve ..\lib\install.ps1)
+. (resolve ..\lib\manifest.ps1)
+. (resolve ..\lib\versions.ps1)
 
 if(!$app) { 
 	# update scoop

diff --git a/lib/cmd/which.ps1 → libexec/which.ps1 b/lib/cmd/which.ps1 → libexec/which.ps1
@@ -2,8 +2,8 @@
 # Summary: Locate a program path
 # Help: Finds the path to a program that was installed with Scoop
 param($command)
-. "$(split-path $myinvocation.mycommand.path)\..\core.ps1"
-. (resolve '..\help.ps1')
+. "$(split-path $myinvocation.mycommand.path)\..\lib\core.ps1"
+. (resolve '..\lib\help.ps1')
 
 if(!$command) { 'ERROR: <command> missing'; my_usage; exit 1 }