From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Wed, 4 Apr 2007 15:09:51 +0000 (+0000)
Subject: templatepkg: small changes
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d5936c8ff0c14aa8d45dec8914be9ce19dd41ee3;p=simplepkg.git

templatepkg: small changes

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

diff --git a/trunk/src/templatepkg b/trunk/src/templatepkg
index dc00ef7..0451dde 100755
--- a/trunk/src/templatepkg
+++ b/trunk/src/templatepkg
@@ -299,22 +299,22 @@ function template_add {
             cd $TEMPLATE_BASE.d
             svn add ./$candidate
             if [ "$?" != "0" ]; then
-              echo $BASENAME: error adding `echo $candidate | sed -e 's/\/*/\//g'` 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 `echo $jail/$candidate | sed -e 's/\/*/\//g'` 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 `echo $file | sed -e 's/\/*/\//g'` 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 `echo $file | sed -e 's/\/*/\//g'` already on $TEMPLATE_BASE.d
+      echo $BASENAME: file `echo $file | sed -e 's/\/\+/\//g'` already on $TEMPLATE_BASE.d
       exit 1
     fi
   else
@@ -328,17 +328,17 @@ function template_add {
         cd $TEMPLATE_BASE.d
         svn add ./$file
         if [ "$?" != "0" ]; then
-          echo $BASENAME: error adding `echo $candidate | sed -e 's/\/*/\//g'` 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 `echo $file | sed -e 's/\/*/\//g'` 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 `echo $jail/$file | sed -e 's/\/*/\//g'` on $destination
+        echo Added `echo $jail/$file | sed -e 's/\/\+*/\//g'` on $destination
       fi
 
     else
-      echo $BASENAME: `echo $jail/$file | sed -e 's/\/*/\//g'`: file not found
+      echo $BASENAME: `echo $jail/$file | sed -e 's/\/\+/\//g'`: file not found
       exit 1
     fi
   fi