minor fixes

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

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 7b7aca9cde64d2e011c91eec59c4b5140e2f2d3d..8539abd11d53b7a3fd025f4f47bd4f1d01d22703 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -210,7 +210,7 @@ function eval_config {
     HTTP_TOOL="`eval_parameter HTTP_TOOL curl`"
     CONNECT_TIMEOUT="`eval_parameter CONNECT_TIMEOUT 0`"
     TEMPLATE_FOLDER="`eval_parameter TEMPLATE_BASE /etc/simplepkg/templates`"
-    TEMPLATE_STORAGE_STYLE="`eval_parameter TEMPLATE_STORAGE_STYLE own-folder`"
+    TEMPLATE_STORAGE_STYLE="`eval_parameter TEMPLATE_STORAGE_STYLE compact`"
 
     SIMPLARET_CLEAN="`eval_boolean_parameter SIMPLARET_CLEAN 1`"
     SIMPLARET_DELETE_DOWN="`eval_boolean_parameter SIMPLARET_DELETE_DOWN 1`"
@@ -553,9 +553,13 @@ function templates_under_svn {
 
   # check if svn usage is enabled
 
-  if [ "$TEMPLATES_UNDER_SVN" == "1" ] && \
-     [ "$TEMPLATE_STORAGE_STYLE" == "own-folder" ]; then
-     return 0
+  if [ "$TEMPLATES_UNDER_SVN" == "1" ]; then
+    if [ "$TEMPLATE_STORAGE_STYLE" == "own-folder" ] || \
+       [ "$TEMPLATE_STORAGE_STYLE" == "compact" ]; then
+      return 0
+    else
+      return 1
+    fi
    else
      return 1
    fi

diff --git a/trunk/src/templatepkg b/trunk/src/templatepkg
index 2c8e367d7a2c56969ef124bad90e53fac8d6b56d..9fadd5e9c38b052001238d392c02dccd5986fe10 100755 (executable)
--- a/trunk/src/templatepkg
+++ b/trunk/src/templatepkg
@@ -681,8 +681,9 @@ function template_list {
 
   local list basedir template
 
-  if [ "$TEMPLATE_STORAGE_STYLE" != "own-folder" ]; then
-    echo "$BASENAME: option only available if TEMPLATE_STORAGE_STYLE configured as 'own-folder'"
+  if [ "$TEMPLATE_STORAGE_STYLE" != "own-folder" ] || \
+     [ "$TEMPLATE_STORAGE_STYLE" != "compact" ]; then
+    echo "$BASENAME: option only available if TEMPLATE_STORAGE_STYLE configured as 'own-folder' or 'compact'"
     return 1
   fi