some changes on simplaret, moved metapkg to utils/

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

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index cd9001a15cc5102720b530f9b72ec0e013bccf97..6e0958892d5e5f2be9bd139ad2d79f416d822cab 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -2,10 +2,12 @@ simplepkg changelog
 -------------------
 
 0.4.9pre24: subversion repository support for templates
+            metapkg moved to utils/
             simplaret:
             - new config variables:
               - STORE_ROOT_PATCHES_ON_PATCHES_DIR
               - SIGNATURE_CHECKING
+              - ROOT=/otherroot works for --install, --remove and --upgrade
             - signature checking
             - dependency checking through slack-required
             mkjail:

diff --git a/trunk/src/simplaret b/trunk/src/simplaret
index 870fbf6112bd04565524e25c1cf290611d970677..6ac93d7f805d987225bb201e9e18d0be1d88c79e 100755 (executable)
--- a/trunk/src/simplaret
+++ b/trunk/src/simplaret
@@ -718,13 +718,16 @@ function simplaret_get_jail_patches {
 
 function simplaret_get_patches {
 
-  local jailpath oldroot
+  local jailpath
 
   if [ "$1" == "--upgrade" ]; then
     IS_UPGRADE="1"
   fi
 
-  oldroot="$ROOT"
+  if [ ! -z "$ROOT" ]; then
+    simplaret_get_jail_patches $ROOT
+    return $?
+  fi
 
   # first get patches from the root system
   simplaret_get_jail_patches
@@ -739,7 +742,7 @@ function simplaret_get_patches {
     done
   fi
 
-  ROOT="$oldroot"
+  ROOT=""
 
 }
 
@@ -991,7 +994,7 @@ case $1 in
   "--purge" | "purge") shift ; simplaret_purge $* ;;
   "--install" | "install") shift ; simplaret_install $* ;;
   "--upgrade" | "upgrade") simplaret_get_patches --upgrade ;;
-  "--remove" | "remove") removepkg $2 ;;
+  "--remove" | "remove") ROOT=/$ROOT removepkg $2 ;;
   *) simplaret_usage ;;
 esac
 

diff --git a/trunk/src/metapkg b/trunk/utils/metapkg
similarity index 81%
rename from trunk/src/metapkg
rename to trunk/utils/metapkg
index d86807e6d04e83c3c4a196498dbc100af98c4b71..e3db6028ad566de952cb7f0e33eaed54c999c19b 100755 (executable)
--- a/trunk/src/metapkg
+++ b/trunk/utils/metapkg
@@ -21,6 +21,17 @@
 # Remeber that mkjail template == metapkg metapackage.
 # 
 
+#
+# TODO
+#
+# In the mean term, metapkg will not be developed, but the code will rest
+# until someone need it. Some ideas to think for the future of metapkg would
+# be a better integration with simplepkg structure, like:
+#
+# - By default metapkg searches by a slack-required in the package/slackbuilds repos
+# - With -f, metapkg uses a local file (template, slack-required or tagfile)
+#
+
 COMMON="/usr/libexec/simplepkg/common.sh"
 BASENAME="`basename $0`"
 ROOT="/"