- lspkg: support for $ROOT env variable and some improvements

- CHANGELOG cleanup
- mkjail: added support for slack-required as templates

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

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 6e0958892d5e5f2be9bd139ad2d79f416d822cab..3c9988ec8554554641c821dce79cd558bd19e06b 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -1,146 +1,249 @@
 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:
-            - templates now can be stored either on
-               - /etc/simplepkg/template_name.template
-               - /etc/simplepkg/templates/template_name.template
-               - /etc/simplepkg/templates/template_name/template_name.template
-            jail-update: renamed to jail-commit
-            templatepkg: -a option changed to add files into a template
-                         -u option now updated a template
-
-0.4.9pre18-23: simplaret:
-               - enhanced http retrieval: curl support
-               - enhanced verbosity
-               - get-patches small changes
-               - various fixes
-
-0.4.9pre10-17: lots of simplaret fixes
-
-0.4.9pre9: createpkg:
-             - speedup
-             - ncftpget support
-             - timeout support
-             - sets the correct architecture
-            deleted jail-upgrade
-            removed swaret support
-
-0.4.9pre8: createpkg: bugfix
-           common.sh:
-             - enhanced config file evaluation
-             - fixed function default_arch
-           simplaret:
-             - config evaluation via common.sh
-             - new config parameter SIMPLARET_PURGE_PATCHES
+===================
+
+0.5pre1
+=======
+
+  - lspkg:
+    - support for $ROOT env variable
+    - some improvements
+
+  - CHANGELOG cleanup
+
+  - 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:
+    - added support for slack-required as templates
+    - templates now can be stored either on
+      - /etc/simplepkg/template_name.template
+      - /etc/simplepkg/templates/template_name.template
+      - /etc/simplepkg/templates/template_name/template_name.template
+
+  - jail-update renamed to jail-commit
+
+  - templatepkg:
+    -a option changed to add files into a template
+    -u option now updated a template
+
+0.4.9pre18-23
+=============
+
+  - simplaret:
+    - enhanced http retrieval: curl support
+    - enhanced verbosity
+    - get-patches small changes
+    - various fixes
+
+0.4.9pre10-17
+=============
+
+  - lots of simplaret fixes
+
+0.4.9pre9
+=========
+
+  - createpkg:
+    - speedup
+    - ncftpget support
+    - timeout support
+    - sets the correct architecture
+
+  - deleted jail-upgrade
+
+  - removed swaret support
+
+0.4.9pre8
+=========
+
+  - createpkg: bugfix
+
+  - common.sh:
+    - enhanced config file evaluation
+    - fixed function default_arch
+
+  - simplaret:
+    - config evaluation via common.sh
+    - new config parameter SIMPLARET_PURGE_PATCHES
  
-0.4.9pre7: repos: added patches/ metafile creation
-            jail-upgrade:
-             - added option CONSIDER_ALL_PACKAGES_AS_PATCHES
-             - merged swaret and simplaret upgrade procedures
-             - act recursively on patches' folder
-            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
-                firts matching package is downloaded.
-              - new config parameter ROOT_PRIORITY set the priority
-                of folder lookup at a ROOT repository, defaults to
-                "patches slackware extra testing pasture".
-              - for --get, check if an already existing package
-                in the local repository has the same version and
-                build number, otherwise erase the old and download
-                the new one.
-              - fixed --get-paches
-              - added --upgrade option
-              - added --install
-              - added --remove
-              - new config parameter DOWNLOAD_EVEN_APPLIED_PATCHES
-             createpkg: lots of changes...
-
-0.4.9pre6: createpkg:
-             - fixes
-             - now with slackbuild error handling
-             - increased verbosity
-           small fixes on rebuildpkg 
-           lspkg enhancements
-           simplaret fix on --purge
-           updated default repos.conf
-
-0.4.9pre5: added script "repos"
-           moved simplaret to /usr/bin
-
-0.4.9pre4: createpkg: better command line evaluation,
-           now using "upgradepkg --install-new" to
-           install a package and added the command
-           line option --no-deps so createpkg doesn't
-           goes down to solve all slack-required
-           dependencies.
-
-0.4.9pre3: small fix on createpkg when handling with
-           slackbuilds with similar names
-
-0.4.9pre2: fixed simplepkg.SlackBuild
-           fixed doinst.sh
-           re-organized the source repository
-           added createpkg
-           updated README and README.pt_BR
-
-0.4.8: simplaret: removed extra folder from slamd64 definition
-                  and fixed a typo
-
-0.4.7: templatepkg bugfix on blank template lines and on package deletion
-       changed simplaret working dir in simplaret.conf.new
-
-0.4.6: small bugfix on jail-update that prevented template update
-
-0.4.5: vserver template update
-
-0.4.4: WARNING option on config file for simplaret
-
-       SILENT env var, if a non-zero value, keeps simplaret
-       work silenty when purging and works like if WANRING is set
-       to not null.
-
-       add SIMPLARET_DELETE_DURING config parameter: when set
-       to a non-zero value deletes each package rigth after its
-       installation
-
-0.4.3: openoffice.org template
-
-0.4.2: common.sh: fix on install_packages when handling
-       with similar package names
-
-0.4.1: templatepkg: fixed tagfiles and comment handling
-
-0.4: multi-plataform and version management
+0.4.9pre7
+=========
+
+  - repos: added patches/ metafile creation
+
+  - jail-upgrade:
+    - added option CONSIDER_ALL_PACKAGES_AS_PATCHES
+    - merged swaret and simplaret upgrade procedures
+    - act recursively on patches' folder
+
+  - 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
+      firts matching package is downloaded.
+    - new config parameter ROOT_PRIORITY set the priority
+      of folder lookup at a ROOT repository, defaults to
+      "patches slackware extra testing pasture".
+    - for --get, check if an already existing package
+      in the local repository has the same version and
+      build number, otherwise erase the old and download
+      the new one.
+    - fixed --get-paches
+    - added --upgrade option
+    - added --install
+    - added --remove
+    - new config parameter DOWNLOAD_EVEN_APPLIED_PATCHES
+
+  - createpkg: lots of changes
+
+0.4.9pre6
+=========
+
+  - createpkg:
+    - fixes
+    - now with slackbuild error handling
+    - increased verbosity
+
+  - small fixes on rebuildpkg 
+
+  - lspkg enhancements
+
+  - simplaret fix on --purge
+
+  - updated default repos.conf
+
+0.4.9pre5
+=========
+
+  - added script "repos"
+
+  - moved simplaret to /usr/bin
+
+0.4.9pre4
+=========
+
+  - createpkg: better command line evaluation,
+    now using "upgradepkg --install-new" to
+    install a package and added the command
+    line option --no-deps so createpkg doesn't
+    goes down to solve all slack-required
+    dependencies.
+
+0.4.9pre3
+=========
+
+  - small fix on createpkg when handling with
+    slackbuilds with similar names
+
+0.4.9pre2
+=========
+
+  - fixed simplepkg.SlackBuild
+
+  - fixed doinst.sh
+
+  - re-organized the source repository
+
+  - added createpkg
+
+  - updated README and README.pt_BR
+
+0.4.8
+=====
+
+  - simplaret: removed extra folder from slamd64 definition
+
+  - fixed a typo
+
+0.4.7
+=====
+
+  - templatepkg bugfix on blank template lines and on package deletion
+    changed simplaret working dir in simplaret.conf.new
+
+0.4.6
+=====
+
+  - small bugfix on jail-update that prevented template update
+
+0.4.5
+=====
+
+  - vserver template update
+
+0.4.4
+=====
+
+  - WARNING option on config file for simplaret
+
+  - SILENT env var, if a non-zero value, keeps simplaret
+    work silenty when purging and works like if WANRING is set
+    to not null.
+
+  - added SIMPLARET_DELETE_DURING config parameter: when set
+    to a non-zero value deletes each package rigth after its
+    installation
+
+0.4.3
+=====
+
+  - added openoffice.org template
+
+0.4.2
+=====
+
+  - common.sh: fix on install_packages when handling
+    with similar package names
+
+0.4.1
+=====
+
+  - templatepkg: fixed tagfiles and comment handling
+
+0.4
+===
+
+  - multi-plataform and version management
 
     now simplepkg supports jails with architectures and versions 
     others than the main system, read the docs for details.
 
-    added simplaret: a small script for downloading packages
+  - added simplaret: a small script for downloading packages
      
-    jail-upgrade
+  - jail-upgrade
 
       * arch checking via /etc/slackware-version on each jail
       * supports multi-arch and multi-version repository
       * integrated with simplaret
 
-     common.sh: improved functions to support simplaret
+  -  common.sh: improved functions to support simplaret
+
+0.3.7-0.3.9
+===========
+
+  - bugfix releases
+
+0.3.6
+=====
+
+  - added "-u" option to eval_config to ask for a swaret --update
+
+0.3.5
+=====
 
-0.3.7-0.3.9: bugfix releases
+  - "main" jail support for jail-update
 
-0.3.6: added "-u" option to eval_config to ask for a swaret --update
+0.3.4
+=====
 
-0.3.5: "main" jail support for jail-update
+  - Started changelog :)
 
-0.3.4: started changelog :)

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 38e9468b4f05131b79545dce618763eb585f25e1..e2dfa6a9c689529f1db2479081a88ff22a10e408 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -105,7 +105,7 @@ function install_packages {
   root="$JAIL_ROOT/$server"
 
   # now tries to install each package listed in the template
-  for pack in `cat $TEMPLATE | grep -v -e "^#" | cut -d : -f 1`; do
+  for pack in `cat $TEMPLATE | grep -v -e "^#" | cut -d : -f 1 | awk '{ print $1 }'`; do
 
     # try to install the package
     ROOT=/$root ARCH=$ARCH VERSION=$VERSION $SIMPLARET --install $pack --skip-checks

diff --git a/trunk/src/lspkg b/trunk/src/lspkg
index a329aee8df8c1b123d3fa6a51fe7958480c8f2e1..224d0994b15b4f3c013e55b5d346d2d19a15847d 100755 (executable)
--- a/trunk/src/lspkg
+++ b/trunk/src/lspkg
@@ -17,7 +17,7 @@
 #  Place - Suite 330, Boston, MA 02111-1307, USA
 #
 function head_line {
-    echo "usage: `basename $0` [option expression]"
+    echo "usage: [ROOT=/otherroot] `basename $0` [option expression]"
 }
 
 function usage {
@@ -46,9 +46,9 @@ else
 fi
 
 if [ $# -eq 2 ]; then
-    LIST_PKGS=`ls /var/log/packages/$2-[0-9]* 2> /dev/null`
+    LIST_PKGS=`ls /$ROOT/var/log/packages/$2-[0-9]* 2> /dev/null`
 else
-    LIST_PKGS=`ls /var/log/packages/$1-[0-9]* 2> /dev/null`
+    LIST_PKGS=`ls /$ROOT/var/log/packages/$1-[0-9]* 2> /dev/null`
 fi
 
 case $1 in
@@ -62,7 +62,11 @@ case $1 in
                     less $file
                 done
             else
-                echo "$2: package not found on /var/log/packages"
+                if [ ! -z "$ROOT" ]; then
+                    echo "$2: package not found on /$ROOT/var/log/packages"
+                else
+                    echo "$2: package not found on /var/log/packages"
+                fi
             fi
         else
             head_line
@@ -79,13 +83,13 @@ case $1 in
     "-r"|"--remove")
         if [ ! -z "$2" ]; then
             if [ ! -z "$LIST_PKGS" ]; then
-                removepkg /var/log/packages/$1-[0-9]*
+                removepkg /$ROOT/var/log/packages/$1-[0-9]*
             fi
         fi
     ;;
     "-s"|"--search")
         if [ ! -z "$2" ]; then
-            eval "grep -l '\/$2$' /var/log/packages/*"
+            eval "grep -l '\/$2$' /$ROOT/var/log/packages/*"
         fi
     ;;
     "-d"|"--description")
@@ -103,7 +107,11 @@ case $1 in
         if [ ! -z "$LIST_PKGS" ]; then
             echo "$LIST_PKGS"
         else
-            echo "$1: package not found on /var/log/packages"
+            if [ ! -z "$ROOT" ]; then
+                echo "$2: package not found on /$ROOT/var/log/packages"
+            else
+                echo "$2: package not found on /var/log/packages"
+            fi
         fi
     ;;
 esac