|
@@ -176,21 +176,23 @@ expand_variables() {
|
176
|
176
|
#
|
177
|
177
|
local script=$(mktemp --tmpdir mkit-tmp.XXXXXXXXXX)
|
178
|
178
|
local section varname varvalue
|
179
|
|
- for section in "$@";
|
180
|
|
- do
|
181
|
|
- debug_var section
|
182
|
|
- ini lskeys "$section" \
|
183
|
|
- | while read varname;
|
184
|
|
- do
|
185
|
|
- varvalue="$(ini 1value "$section:$varname" | sed -e 's/\$/\\$/' )"
|
186
|
|
- echo "s|$varname|$varvalue|;" >> "$script"
|
187
|
|
- debug_var varname varvalue
|
188
|
|
- done
|
189
|
|
- done
|
190
|
|
- echo "s|__MKIT_PROJ_CODENAME__|$(ini 1value project:codename)|;" >> "$script"
|
191
|
|
- echo "s|__MKIT_PROJ_PKGNAME__|$(ini 1value project:pkgname)|;" >> "$script"
|
192
|
|
- echo "s|__MKIT_PROJ_TAGLINE__|$(ini 1value project:tagline)|;" >> "$script"
|
193
|
|
- echo "s|__MKIT_PROJ_VERSION__|$(get_version)|;" >> "$script"
|
|
179
|
+ {
|
|
180
|
+ for section in "$@";
|
|
181
|
+ do
|
|
182
|
+ debug_var section
|
|
183
|
+ ini lskeys "$section" \
|
|
184
|
+ | while read varname;
|
|
185
|
+ do
|
|
186
|
+ varvalue="$(ini 1value "$section:$varname" | sed -e 's/\$/\\$/' )"
|
|
187
|
+ echo "s|$varname|$varvalue|;"
|
|
188
|
+ debug_var varname varvalue
|
|
189
|
+ done
|
|
190
|
+ done
|
|
191
|
+ echo "s|__MKIT_PROJ_CODENAME__|$(ini 1value project:codename)|;"
|
|
192
|
+ echo "s|__MKIT_PROJ_PKGNAME__|$(ini 1value project:pkgname)|;"
|
|
193
|
+ echo "s|__MKIT_PROJ_TAGLINE__|$(ini 1value project:tagline)|;"
|
|
194
|
+ echo "s|__MKIT_PROJ_VERSION__|$(get_version)|;"
|
|
195
|
+ } >> "$script"
|
194
|
196
|
perl -wp "$script" || die "expand_variables failed"
|
195
|
197
|
rm "$script"
|
196
|
198
|
}
|