Help works from outside packager directory now, some help updates.

arian · May 9, 2010 · 4eaced4 · 4eaced4
1 parent bf2f7de
commit 4eaced4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/help/build.txt b/help/build.txt
@@ -3,16 +3,15 @@ Usage: packager build <components> [args...]
 
 build arguments:
   <components>
-  +components <components> Build passed in components and their dependancies
-                           using your registered packages.
-  +files <files>           Build passed in files and their dependancies
-                           using your registered packages.
-  +packages <directories>  Use unregistered packages residing in the passed
-                           in directories in addition to the registered
-                           packages.
-  -packages <packages>     Don't use passed in packages. This lets you build
-                           components without dependancies.
-  +use-only <packages>     Use only the passed in packages. This lets you
-                           build components without dependancies.
-  -blocks <blocks>         Exclude optional blocks from the sources of the
-                           components you're building.
+  +components <components>     Build passed in components and their
+                               dependancies using your registered packages.
+  +files <files>               Build passed in files and their dependancies
+                               using your registered packages.
+  +packages <dirs>|<manifests> Use the passed in unregistered packages
+                               in addition to the registered packages.
+  -packages <packages>         Don't use passed in packages. This lets you
+                               build components without dependancies.
+  +use-only <packages>         Use only the passed in packages. This lets you
+                               build components without dependancies.
+  -blocks <blocks>             Exclude optional blocks from the sources of
+                               the components you're building.
diff --git a/help/register.txt b/help/register.txt
@@ -1,7 +1,8 @@
 Usage: packager register <dir>|<manifest>
 
 register arguments:
-  <dir>      Directory in which the package resides. In this case
-             <dir>/package.yml will be used as manifest.
+  <dir>      Directory in which the package resides. In this case Packager
+             will look for a package.yml, package.yaml or package.json
+             inside <dir>.
   <manifest> Manifest file to use. In this case the directory in which the
              manifest file resides will be used as package directory.
diff --git a/packager b/packager
@@ -188,8 +188,9 @@ switch ($command){
 }
 
 function usage($command = ''){
-	if (empty($command) || !file_exists("help/$command.txt")) $command = 'default';
-	echo(file_get_contents("help/$command.txt"));
+	$dir = dirname(__FILE__);
+	if (empty($command) || !file_exists("$dir/help/$command.txt")) $command = 'default';
+	echo file_get_contents("$dir/help/$command.txt");
 }
 
 ?>