search_default_template fix

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

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index e85689088e9c1e53263a192073a055e888a6ed63..778fcc6cd79e5f8add435855a23ee8a61e9a6ea7 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -321,14 +321,18 @@ function default_arch {
 
 function search_default_template {
 
-  if [ -e "$BASE_CONF/templates/default.template" ]; then
-    TEMPLATE_BASE="$BASE_CONF/templates/default"
-    echo $BASENAME: using default template
-  elif [ -e "$BASE_CONF/default.template" ]; then
+  if [ -e "$BASE_CONF/default.template" ]; then
     TEMPLATE_BASE="$BASE_CONF/default"
     echo $BASENAME using default template
+  elif [ -e "$BASE_CONF/templates/default.template" ]; then
+    TEMPLATE_BASE="$BASE_CONF/templates/default"
+    echo $BASENAME: using default template
+  elif [ -e "$BASE_CONF/templates/default/default.template" ]; then
+    TEMPLATE_BASE="$BASE_CONF/templates/default/default"
+    echo $BASENAME: using default template
   elif [ -e "$BASE_CONF/defaults/templates/default/default.template" ]; then
     TEMPLATE_BASE="$BASE_CONF/defaults/templates/default"
+    echo $BASENAME using default template
   else
     echo $BASENAME: error: default template not found
     echo $BASENAME: please create a template using templatepkg