- 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

1 files changed, 15 insertions, 7 deletions

diff --git a/trunk/src/lspkg b/trunk/src/lspkg
index a329aee..224d099 100755
--- 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