Adding more package() keys.

sm · Sep 6, 2011 · 09b84cd · 09b84cd
1 parent cf1c56f
commit 09b84cd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/core/api/shell/package/functions b/core/api/shell/package/functions
@@ -74,6 +74,33 @@ package()
         _key="$1"
         shift || fail "Key name must follow keyword 'key'"
         ;;
+      (name)
+        package_name="$1"
+        shift || fail "a package name must follow keyword 'name'"
+      (version)
+        package_version="$1"
+        shift || fail "a package version must follow keyword 'version'"
+      (base_url)
+        package_base_url="$1"
+        shift || fail "a package base_url must follow keyword 'base_url'"
+      (file)
+        package_file="$1"
+        shift || fail "a package file name must follow keyword 'file'"
+      (user)
+        package_user="$1"
+        shift || fail "a package user name must follow keyword 'user'"
+      (archive_format)
+        archive_format="$1"
+        shift || fail "a package archive_format must follow keyword 'archive_format'"
+      (md5)
+        package_md5="$1"
+        shift || fail "a package md5 sum must follow keyword 'md5'"
+      (sha256)
+        package_sha256="$1"
+        shift || fail "a package sha256 key must follow keyword 'sha256'"
+      (sha512)
+        package_sha512="$1"
+        shift || fail "a package sha512 key must follow keyword 'sha512'"
       (*)
         if [[ -z "${_command}" ]]
         then

diff --git a/core/internal/shell/package/functions b/core/internal/shell/package/functions
@@ -9,11 +9,6 @@ __sm.package.cli()
   do
     _token="${_package_args[$index]}"
     case "${_token}" in
-      (prefix)
-        packages_path="${_package_args[$((++index))]}"
-        [[ -n "${packages_path}" ]] ||
-          error "a path must follow keyword 'prefix'"
-        ;;
       (src)
         src_path="${_package_args[$((++index))]}"
         [[ -n "${src_path}" ]] ||