From 31f5b6d878e3f69745d4119938432358287f609e Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Wed, 4 Apr 2007 15:05:56 +0000
Subject: templatepkg: small changes

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@226 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/src/templatepkg | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'trunk')

diff --git a/trunk/src/templatepkg b/trunk/src/templatepkg
index 9e7f3d3..dc00ef7 100755
--- a/trunk/src/templatepkg
+++ b/trunk/src/templatepkg
@@ -228,6 +228,8 @@ function template_update {
     exit 1
   fi
 
+  echo Checking package list for template `basename $TEMPLATE_BASE`
+
   for package in `ls -1 $ROOT/var/log/packages/`; do
     pack=`package_name $package`
     if [ -f $TEMPLATE ]; then
@@ -297,22 +299,22 @@ function template_add {
             cd $TEMPLATE_BASE.d
             svn add ./$candidate
             if [ "$?" != "0" ]; then
-              echo $BASENAME: error adding $candidate into the revision system
+              echo $BASENAME: error adding `echo $candidate | sed -e 's/\/*/\//g'` into the revision system
             fi
             cd $cwd
             info_commit="yes"
           else
-            echo Added $jail/$candidate on $TEMPLATE_BASE.d/$candidate
+            echo Added `echo $jail/$candidate | sed -e 's/\/*/\//g'` on $TEMPLATE_BASE.d/$candidate
           fi
         fi
       done
 
       if [ "$info_commit" == "yes" ]; then
-        echo $BASENAME: please run jail-commit to add files under $file into the svn repository
+        echo $BASENAME: please run jail-commit to add files under `echo $file | sed -e 's/\/*/\//g'` into the svn repository
       fi
 
     else
-      echo $BASENAME: file $file already on $TEMPLATE_BASE.d
+      echo $BASENAME: file `echo $file | sed -e 's/\/*/\//g'` already on $TEMPLATE_BASE.d
       exit 1
     fi
   else
@@ -326,17 +328,17 @@ function template_add {
         cd $TEMPLATE_BASE.d
         svn add ./$file
         if [ "$?" != "0" ]; then
-          echo $BASENAME: error adding $candidate into the revision system
+          echo $BASENAME: error adding `echo $candidate | sed -e 's/\/*/\//g'` into the revision system
         fi
         cd $cwd
-        echo $BASENAME: please run jail-commit to add $file into the svn repository
+        echo $BASENAME: please run jail-commit to add `echo $file | sed -e 's/\/*/\//g'` into the svn repository
         true
       else
-        echo Added $jail/$file on $destination
+        echo Added `echo $jail/$file | sed -e 's/\/*/\//g'` on $destination
       fi
 
     else
-      echo $BASENAME: $jail/$file: file not found
+      echo $BASENAME: `echo $jail/$file | sed -e 's/\/*/\//g'`: file not found
       exit 1
     fi
   fi
-- 
cgit v1.2.3