From eedc947c87b2fba8887cb3ec49402142450980e2 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 3 Dec 2015 18:17:34 +0100 Subject: fixup_ptxconfigs.sh: improve fixup Signed-off-by: Michael Olbrich --- fixup_ptxconfigs.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/fixup_ptxconfigs.sh b/fixup_ptxconfigs.sh index 3e69876..f260b34 100755 --- a/fixup_ptxconfigs.sh +++ b/fixup_ptxconfigs.sh @@ -302,6 +302,9 @@ fixup() clear + # add any new variables so they can be replaced + ./p --force --ptxconfig="${config}" oldconfig < /dev/null || exit 1 + local sed_magic="" for var in ${!PTXCONF_@}; do # remove tabs :) @@ -309,7 +312,9 @@ fixup() echo "${var}"="${!var}" sed_magic="${sed_magic} $(get_replace "${var}")" - unset "${var}" + if [ "${var}" != "PTXCONF_CONFIGFILE_VERSION" ]; then + unset "${var}" + fi done eval sed -i "${sed_magic}" "${config}" @@ -322,6 +327,11 @@ fixup() sed -i 's/PTXCONF__ptxconfig_MAGIC__=y//' "${config}" ./p --force --ptxconfig="${config}" oldconfig || exit 1 + + # fix PTXdist version + eval sed -i "$(get_replace PTXCONF_CONFIGFILE_VERSION)" \ + -e "\"s~^\(\# PTXdist \).*~\1${PTXCONF_CONFIGFILE_VERSION}~\"" \ + "${config}" } update() -- cgit v1.2.3