go-opsi
/
opsi.opsi-builder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change DistRoot to PackagePath

This commit is contained in:
Mario Fetka 2013-07-06 08:34:04 +02:00
parent 18ccc07e4f
commit 3087df2034
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/builder-utils.sh
View File

@ -245,8 +245,8 @@ create_winst_varfile() {
echo "; Opsi Builder Variables" >>$var_file
# make the scriptpath for the binarys configurable
echo "DefVar \$DistRoot\$" >>$var_file
echo "Set \$DistRoot\$ = \"%ScriptPath%\"" >>$var_file
echo "DefVar \$PackagePath\$" >>$var_file
echo "Set \$PackagePath\$ = \"%ScriptPath%\"" >>$var_file
echo >>$var_file
for (( i = 0 ; i < ${#DL_SOURCE[@]} ; i++ )) ; do
@ -254,7 +254,7 @@ create_winst_varfile() {
if [ ! -z "${DL_ARCH[$i]}" ] ; then arch_str="${DL_ARCH[$i]}\\" ; fi
echo "DefVar \$${DL_WINST_NAME[$i]}\$" >>$var_file
echo "Set \$${DL_WINST_NAME[$i]}\$ = \$DistRoot\$ + \"\\${arch_str}${DL_FILE[$i]}\"" >>$var_file
echo "Set \$${DL_WINST_NAME[$i]}\$ = \$PackagePath\$ + \"\\${arch_str}${DL_FILE[$i]}\"" >>$var_file
done
# publish some other variables
@ -276,7 +276,7 @@ create_winst_varfile() {
if [ "$index" != "${WINST_VALUE[$i]}" ] ; then
if [ ! -z "${DL_ARCH[$index]}" ] ; then arch_part="\\\\${DL_ARCH[$index]}" ; fi
if [ ! -z "${DL_EXTRACT_WINST_PATH[$index]}" ] ; then extr_part="\\\\${DL_EXTRACT_WINST_PATH[$index]}" ; fi
local new_val="\$DistRoot\$ + $arch_part$extr_part"
local new_val="\$PackagePath\$ + $arch_part$extr_part"
WINST_VALUE[$i]=`echo ${WINST_VALUE[$i]} | sed -e "s#@DL_EXTRACT_WINST_PATH\[[0-9]\]@#$new_val#"`
log_debug "calculated (DL_EXTRACT_WINST_PATH) WINST_VALUE: ${WINST_VALUE[$i]}"
fi
@ -286,8 +286,8 @@ create_winst_varfile() {
done
# correct me im a hack
sed -e 's#"\$DistRoot\$ +#\$DistRoot\$ + "#' -i $var_file
sed -e 's#\$DistRoot\$ + " #\$DistRoot\$ + "#' -i $var_file
sed -e 's#"\$PackagePath\$ +#\$PackagePath\$ + "#' -i $var_file
sed -e 's#\$PackagePath\$ + " #\$PackagePath\$ + "#' -i $var_file
echo >>$var_file
}