diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-04 01:22:34 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-04 01:22:34 +0000 |
| commit | ee1b2882e0a5cd6f96451c378f101b1a31b93ee6 (patch) | |
| tree | bfe562b7037c2455e36ec522e1d4ab00fd81cff8 | |
| parent | e8fdc3eca967f4fa614f0c1766cadcb3db04a295 (diff) | |
| download | simplepkg-ee1b2882e0a5cd6f96451c378f101b1a31b93ee6.tar.gz simplepkg-ee1b2882e0a5cd6f96451c378f101b1a31b93ee6.tar.bz2 | |
minor fixes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@637 04377dda-e619-0410-9926-eae83683ac58
| -rw-r--r-- | trunk/lib/common.sh | 12 | ||||
| -rwxr-xr-x | trunk/src/templatepkg | 5 |
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 |