Merge branch 'master' into createcorelib

This commit is contained in:
Nico Schottelius 2011-06-17 14:14:52 +02:00
commit 6d0cdc9456
5 changed files with 12 additions and 5 deletions

View file

@ -21,7 +21,11 @@
# Get the current value of key or __NOTSET__ if the key doesn't exist. # Get the current value of key or __NOTSET__ if the key doesn't exist.
# #
if [ -f "$__object/parameter/key" ]; then
key="$(cat "$__object/parameter/key")" key="$(cat "$__object/parameter/key")"
else
key="$__object_id"
fi
file="$(cat "$__object/parameter/file")" file="$(cat "$__object/parameter/file")"
delimiter="$(cat "$__object/parameter/delimiter")" delimiter="$(cat "$__object/parameter/delimiter")"

View file

@ -41,7 +41,7 @@ DONE
# change value # change value
cat << DONE cat << DONE
awk -F "$delimiter" ' awk -F "$delimiter" '
/${key}${delimiter}*/{gsub(/$value_is/, $value_should)};{print}' "$file" > "${file}+" \ /${key}${delimiter}*/{gsub(/$value_is/, "$value_should")};{print}' "$file" > "${file}+" \
&& mv "${file}+" "$file" && mv "${file}+" "$file"
DONE DONE

View file

@ -49,4 +49,4 @@ for property in $(ls .); do
fi fi
done done
__package_$type "$@" require="$__self" __package_$type "$@"

View file

@ -1,5 +1,7 @@
1.7.1: 1.7.1:
* Add explorers to reference documentation * Documentation: Add explorers to reference
* Documentation: Typo cleanup (Derek Brost)
* Type __key_value: Bugfix (Steven Armstrong)
1.7.0: 2011-05-10 1.7.0: 2011-05-10
* Bugfix type __package_yum: Fix redhat support (Ramon Salvadó) * Bugfix type __package_yum: Fix redhat support (Ramon Salvadó)

View file

@ -153,10 +153,11 @@ done
cat << eof cat << eof
ENVIRONMENT VARIABLES ENVIRONMENT VARIABLES
--------------------- ---------------------
__explorer:: __explorer::
Directory that contains all explorers. Directory that contains all global explorers.
Available for: explorer Available for: explorer
__manifest:: __manifest::
Directory that contains the initial manifest. Directory that contains the initial manifest.