From e7ef899faa3503b9e315bbcadaef0319f05efd56 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Mon, 24 Nov 2008 19:36:12 +0000
Subject: templatepkg and mkjail: minor changes

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@534 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/src/mkjail      | 3 ++-
 trunk/src/templatepkg | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'trunk/src')

diff --git a/trunk/src/mkjail b/trunk/src/mkjail
index f6c935c..b45cdd5 100755
--- a/trunk/src/mkjail
+++ b/trunk/src/mkjail
@@ -101,7 +101,8 @@ else
   fi
 fi
 
-echo "$BASENAME: instaling packages into $JAIL_ROOT/$server using $TEMPLATE..."
+echo "Instaling packages into $JAIL_ROOT/$server..."
+echo "Using template: $TEMPLATE."
 
 install_packages
 copy_template_files $JAIL_ROOT/$server
diff --git a/trunk/src/templatepkg b/trunk/src/templatepkg
index a8045ee..ad7306f 100755
--- a/trunk/src/templatepkg
+++ b/trunk/src/templatepkg
@@ -384,11 +384,11 @@ function template_update {
     if [ -f $TEMPLATE ]; then
       if ! `grep -v -e "^#" $TEMPLATE | cut -d : -f 1 | awk '{ print $1 }' | grep -q -e "^$pack\$"`; then
         echo $pack >> $TEMPLATE
-        echo Added $pack # on $TEMPLATE
+        echo Adding $pack # on $TEMPLATE
       fi
     else
       echo $pack >> $TEMPLATE
-      echo Added $pack # on $TEMPLATE
+      echo Adding $pack # on $TEMPLATE
     fi
   done
 
@@ -409,7 +409,7 @@ function template_update {
         sed "/^$pack$/d" $TEMPLATE | sed "/^$pack $/d" | sed "/^$pack:*/d" | sed "/^$pack */d" > $TEMPLATE.tmp
         cat $TEMPLATE.tmp > $TEMPLATE
         rm -f $TEMPLATE.tmp
-        echo Removed $pack # from $TEMPLATE
+        echo Removing $pack # from $TEMPLATE
       fi
     fi
 
-- 
cgit v1.2.3