minor fixes

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

diff --git a/trunk/conf/simplepkg.conf b/trunk/conf/simplepkg.conf
index 60c9ac748cc4befef6f72a15480ecd4dcb132b72..586ddfe64509e9d5c62e31c5cf60335824d2f47e 100644 (file)
--- a/trunk/conf/simplepkg.conf
+++ b/trunk/conf/simplepkg.conf
@@ -22,7 +22,7 @@
 TMP="/tmp"
 
 #---------------------------------------------------------------------
-#                     MKBUILD AND CREATEPKG SECTION
+#                   MKBUILD AND CREATEPKG SECTION
 #---------------------------------------------------------------------
 
 # Set SlackBuilds default directory for scripts
@@ -186,11 +186,11 @@ CONSIDER_ALL_PACKAGES_AS_PATCHES="0"
 STORE_ROOT_PATCHES_ON_PATCHES_DIR="0"
 
 #---------------------------------------------------------------------
-#                         TEMPLATEPKG SECTION
+#                        TEMPLATEPKG SECTION
 #---------------------------------------------------------------------
 
 # Set to yes if your templates will be placed in a subversion repository
-# This just work if TEMPLATE_STORAGE_STYLE is set to own-folder (default)
+# This just work if TEMPLATE_STORAGE_STYLE is set to own-folder or compact.
 TEMPLATES_UNDER_SVN="no"
 
 # Where your templates will be located.

diff --git a/trunk/src/templatepkg b/trunk/src/templatepkg
index 9fadd5e9c38b052001238d392c02dccd5986fe10..67397954d13a48d9c828e763c0c0746add3150fd 100755 (executable)
--- a/trunk/src/templatepkg
+++ b/trunk/src/templatepkg
@@ -681,7 +681,7 @@ function template_list {
 
   local list basedir template
 
-  if [ "$TEMPLATE_STORAGE_STYLE" != "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