templatepkg and mkjail: minor changes

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

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 9f5a359d3ae40209886bb152842a71d792a8d972..79c7f6359408c04123f7316e7a2e0cbb151ebb45 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -4,6 +4,7 @@ simplepkg changelog
 0.6pre31
 ========
 
+    - templatepkg and mkjail: minor changes
     - templates:
       - removed slackware and added slackware-12.1
       - added slamd64-11.0, slamd64-12.0 and slamd64-12.1 templates

diff --git a/trunk/src/mkjail b/trunk/src/mkjail
index f6c935c143ef3abb6c1fb37fb697c0ef3050dc3f..b45cdd59497a98868f7b4c8ea0301b6fe30cc86a 100755 (executable)
--- 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 a8045ee28508f2dd53c85382ce722c614dbcb2e0..ad7306fbf8f4b3a1c5969a4e00075fab242e84ea 100755 (executable)
--- 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