small changes

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

diff --git a/trunk/src/jail-commit b/trunk/src/jail-commit
index 1d5de09aacfe76f307c78db2d0cfd37a15650ca9..de0dab4537ea0ec05363ddcc9d808948af8b8831 100755 (executable)
--- a/trunk/src/jail-commit
+++ b/trunk/src/jail-commit
@@ -30,9 +30,9 @@ fi
 function usage {
 
   echo $BASENAME: commit a jail configuration into a template
-  echo "usage: \'$BASENAME [<jail-path> [template]]\'"
-  echo "       \'$BASENAME --all\' to commit all templates"
-  echo "       \'$BASENAME --help\' for help"
+  echo "usage: \"$BASENAME [<jail-path> [template]]\""
+  echo "       \"$BASENAME --all\" to commit all templates"
+  echo "       \"$BASENAME --help\" for help"
 
 }
 
@@ -138,10 +138,10 @@ elif [ "$1" == "--all" ]; then
 elif echo $1 | grep -q -e "^--"; then
   usage
 elif [ ! -z "$1" ]; then
-  echo "This is jail-commit; Run \'$BASENAME --help\' for help"
+  echo "This is jail-commit; Run \"$BASENAME --help\" for help"
   do_commit $1 $2
 else
-  echo "This is jail-commit; Run \'$BASENAME --help\' for help"
+  echo "This is jail-commit; Run \"$BASENAME --help\" for help"
   if [ -f $JAIL_LIST ]; then
     for jailpath in `cat $JAIL_LIST`; do
       do_commit $jailpath

diff --git a/trunk/src/templatepkg b/trunk/src/templatepkg
index 097ff1b4f805781e8c81d051e24feeed3da83a6c..97cbcbbfa0519f46662f6bbac7e6e970a00bda74 100755 (executable)
--- a/trunk/src/templatepkg
+++ b/trunk/src/templatepkg
@@ -293,7 +293,7 @@ function template_create {
   fi
 
   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 --all' to add files under $file into the svn repository
   fi
 
 }
@@ -391,7 +391,7 @@ function template_add {
       done
 
       if [ "$info_commit" == "yes" ]; then
-        echo $BASENAME: please run jail-commit to add files under `slash $file` into the svn repository
+        echo $BASENAME: please run 'jail-commit --all' to add files under `slash $file` into the svn repository
       fi
 
     else
@@ -420,7 +420,7 @@ function template_add {
         if [ "$?" != "0" ]; then
           echo $BASENAME: error adding `slash $candidate` into the revision system
         else
-          echo $BASENAME: please run jail-commit to add `slash $file` into the svn repository
+          echo $BASENAME: please run 'jail-commit --all' to add `slash $file` into the svn repository
         fi
 
         cd $cwd
@@ -473,7 +473,7 @@ function template_delete {
     if use_svn && [ -d "$TEMPLATE_BASE.d/.svn" ]; then
       cd $TEMPLATE_BASE.d
       svn del --force ./$1 || rm -rf ./$1
-      echo $BASENAME: please run jail-commit to del $1 in the svn repository
+      echo $BASENAME: please run 'jail-commit --all' to del $1 in the svn repository
     else
       rm -rf $TEMPLATE_BASE.d/$1
       echo Removed $1 from $TEMPLATE_BASE.d
@@ -528,6 +528,8 @@ function template_list {
 
   local list
 
+  # TODO: checar se ha /
+
   list="`ls $BASE_CONF/defaults/templates/$1 2> /dev/null`"
   if [ "$?" == "0" ]; then
     list="`echo $list | xargs`"
@@ -562,7 +564,7 @@ function template_post_install_edit {
       vi $TEMPLATE_BASE.s/$1
     fi
     if [ "$sha1sum" != "`sha1sum $TEMPLATE_BASE.s/$1`" ]; then
-      echo $BASENAME: please run \'jail-commit --all\' to send changes to the repository
+      echo $BASENAME: please run 'jail-commit --all' to send changes to the repository
     fi    
   else
 
@@ -574,7 +576,7 @@ function template_post_install_edit {
       if [ -d "$TEMPLATE_BASE.s/.svn" ]; then
         cd $TEMPLATE_BASE.s
         svn add $1
-        echo "$BASENAME: please run \'jail-commit --all\' to send the script to the repository"
+        echo "$BASENAME: please run 'jail-commit --all' to send the script to the repository"
       fi
 
       echo "$BASENAME: script created; run templatepkg -p `basename $TEMPLATE_BASE` $1 again to edit it"
@@ -600,7 +602,7 @@ function template_edit {
       vi $TEMPLATE_BASE.template
     fi
     if [ "$sha1sum" != "`sha1sum $TEMPLATE_BASE.template`" ]; then
-      echo $BASENAME: please run \'jail-commit --all\' to send changes to the repository
+      echo $BASENAME: please run 'jail-commit --all' to send changes to the repository
     fi
   else
     echo $BASENAME: file not found: $TEMPLATE_BASE.template