diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-07 18:14:39 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-07 18:14:39 +0000 |
| commit | 4a79f818f6a77a655199332ef0a7d787d07759cc (patch) | |
| tree | 08a08da169a749134996c9d1641d5cb52fad0283 /trunk/lib/common.sh | |
| parent | e2c20ff09c500808300d6a282fc3b200eadf2d77 (diff) | |
| download | simplepkg-4a79f818f6a77a655199332ef0a7d787d07759cc.tar.gz simplepkg-4a79f818f6a77a655199332ef0a7d787d07759cc.tar.bz2 | |
lots of changes, se file doc/CHANGELOG for info
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@303 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/lib/common.sh')
| -rw-r--r-- | trunk/lib/common.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index cb88ec7..275c355 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -324,11 +324,11 @@ function search_default_template { 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" + elif [ -e "$TEMPLATE_FOLDER/default.template" ]; then + TEMPLATE_BASE="$TEMPLATE_FOLDER/default" echo $BASENAME: using default template - elif [ -e "$BASE_CONF/templates/default/default.template" ]; then - TEMPLATE_BASE="$BASE_CONF/templates/default/default" + elif [ -e "$TEMPLATE_FOLDER/default/default.template" ]; then + TEMPLATE_BASE="$TEMPLATE_FOLDER/default/default" echo $BASENAME: using default template elif [ -e "$BASE_CONF/defaults/templates/default/default.template" ]; then TEMPLATE_BASE="$BASE_CONF/defaults/templates/default" @@ -350,8 +350,8 @@ function search_template { # templates can be stored either on # # - $BASE_CONF/template_name.template - # - $BASE_CONF/templates/template_name.template - # - $BASE_CONF/templates/template_name/template_name.template + # - $TEMPLATE_FOLDER/template_name.template + # - $TEMPLATE_FOLDER/template_name/template_name.template # # also, there's a folder for "oficial" simplepkg templates, # $BASE_CONF/defaults/templates/ and you can override any template @@ -361,10 +361,10 @@ function search_template { if [ -f "$BASE_CONF/$1.template" ]; then TEMPLATE_BASE="$BASE_CONF/$1" - elif [ -f "$BASE_CONF/templates/$1.template" ]; then - TEMPLATE_BASE="$BASE_CONF/templates/$1" - elif [ -f "$BASE_CONF/templates/$1/$1.template" ]; then - TEMPLATE_BASE="$BASE_CONF/templates/$1/$1" + elif [ -f "$TEMPLATE_FOLDER/$1.template" ]; then + TEMPLATE_BASE="$TEMPLATE_FOLDER/$1" + elif [ -f "$TEMPLATE_FOLDER/$1/$1.template" ]; then + TEMPLATE_BASE="$TEMPLATE_FOLDER/$1/$1" elif [ -f "$BASE_CONF/defaults/templates/$1/$1.template" ]; then TEMPLATE_BASE="$BASE_CONF/defaults/templates/$1/$1" else @@ -373,9 +373,9 @@ function search_template { if [ "$TEMPLATE_STORAGE_STYLE" == "simplepkg-folder" ]; then TEMPLATE_BASE="$BASE_CONF/$1" elif [ "$TEMPLATE_STORAGE_STYLE" == "templates-folder" ]; then - TEMPLATE_BASE="$BASE_CONF/templates/$1" + TEMPLATE_BASE="$TEMPLATE_FOLDER/$1" else - TEMPLATE_BASE="$BASE_CONF/templates/$1/$1" + TEMPLATE_BASE="$TEMPLATE_FOLDER/$1/$1" fi elif [ "$2" == "--update" ]; then return 1 |