diff options
Diffstat (limited to 'trunk/lib')
| -rw-r--r-- | trunk/lib/common.sh | 12 |
1 files changed, 8 insertions, 4 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 |