summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Fetka <[email protected]>2013-07-06 06:34:04 (GMT)
committer Mario Fetka <[email protected]>2013-07-06 06:34:04 (GMT)
commit3087df2034b0b9549dea0d1853a612d1296e27ae (patch)
tree12baf7e0c9462965b543dd3cc40d900bb2bb6c7d
parent18ccc07e4f953668ca2bf9aee2aa6c01ed0c3697 (diff)
change DistRoot to PackagePath
-rw-r--r--lib/builder-utils.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/builder-utils.sh b/lib/builder-utils.sh
index 5a4d9c6..cb87ef8 100644
--- a/lib/builder-utils.sh
+++ b/lib/builder-utils.sh
@@ -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
}

Powered by Domaintechnik.at | Hosting - Domain - Webspace