simplaret: added --remove and command line syntax enhancement

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@88 04377dda-e619-0410-9926-eae83683ac58

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index d594bf726029f64aaeca3278426058f461dd866c..a2c05ed18d69727c98346f8323b5a094d447d477 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -6,7 +6,7 @@ simplepkg changelog
              - added option CONSIDER_ALL_PACKAGES_AS_PATCHES
              - merged swaret and simplaret upgrade procedures
              - act recursively on patches' folder
-            simplaret: lots of changes:
+            simplaret: lots of changes, most important are:
               - new repository scheme, take a look at repos.conf.new.
               - --get looks first to PATCHES repositories, then ROOT,
                 then REPOS and finally at NOARCH repositories; the
@@ -21,6 +21,8 @@ simplepkg changelog
               - fixed --get-paches
               - added --upgrade option
               - added --install
+              - added --remove
+             createpkg: lots of changes...
 
 0.4.9: released 0.4.9pre6 as 0.4.9
 

diff --git a/src/simplaret b/src/simplaret
index f0d3ae671a32c98834b97280571f46d70d3675b1..d27bc3496d06d665247e4b9fc19c25294093d1a6 100755 (executable)
--- a/src/simplaret
+++ b/src/simplaret
@@ -23,7 +23,7 @@ COMMON="/usr/libexec/simplepkg/common.sh"
 function simplaret_usage {
 
   echo "usage: [ARCH=otherarch] [VERSION=otherversion] `basename $0` <OPTION> package-name"
-  echo -e "\t OPTIONS: --update, --upgrade, --search, --get, --get-patches, --purge"
+  echo -e "\t OPTIONS: --update, --upgrade, --search, --get, --get-patches, --purge, --remove"
   exit 1
 
 }
@@ -507,6 +507,7 @@ function simplaret_get_jail_patches {
   VERSION="`default_version`"
   ARCH="`default_arch`"
 
+  # TODO: remove it, forcing user to always do a simplaret --update?
   simplaret_update
 
   # in case there's something wrong with the jail, abort
@@ -666,13 +667,14 @@ elif [ "$ARCH" == "sparc" ]; then
 fi
 
 case $1 in
-  --update) simplaret_update ;;
-  --search) simplaret_search $2 ;;
-  --get) simplaret_get $2 ;;
-  --get-patches) simplaret_get_patches ;;
-  --purge) shift ; simplaret_purge $* ;;
-  --install) simplaret_install $2 ;;
-  --upgrade) simplaret_get_patches ; jail-upgrade ;;
+  "--update" | "update") simplaret_update ;;
+  "--search" | "search") simplaret_search $2 ;;
+  "--get" | "get") simplaret_get $2 ;;
+  "--get-patches" | "get-patches") simplaret_get_patches ;;
+  "--purge" | "purge") shift ; simplaret_purge $* ;;
+  "--install" | "install") simplaret_install $2 ;;
+  "--upgrade" | "upgrade") simplaret_get_patches ; jail-upgrade ;;
+  "--remove" | "remove") removepkg $2 ;;
   *) simplaret_usage ;;
 esac