aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--trunk/lib/common.sh12
-rwxr-xr-xtrunk/src/templatepkg5
2 files changed, 11 insertions, 6 deletions
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 7b7aca9..8539abd 100644
--- 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 2c8e367..9fadd5e 100755
--- 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