From 8e512f9a95ed6ef31d1b38e5f2f01dc44930a411 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 27 Jul 2008 14:25:19 +0000 Subject: Re-enable the restart functionality by removing some variables from the saved environment. /trunk/scripts/functions | 16 10 6 0 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/functions b/scripts/functions index c07c336..d71a340 100644 --- a/scripts/functions +++ b/scripts/functions @@ -636,13 +636,17 @@ CT_DoSaveState() { esac CT_DoLog DEBUG " Saving environment and aliases" - # We must omit shell functions + # We must omit shell functions, and some specific bash variables + # that break when restoring the environment, later. We could do + # all the processing in the awk script, but a sed is easier... set |awk ' - BEGIN { _p = 1; } - $0~/^[^ ]+ \(\)/ { _p = 0; } - _p == 1 - $0 == "}" { _p = 1; } - ' >"${state_dir}/env.sh" + BEGIN { _p = 1; } + $0~/^[^ ]+ \(\)/ { _p = 0; } + _p == 1 + $0 == "}" { _p = 1; } + ' |sed -r -e '/^BASH_(ARGC|ARGV|LINENO|SOURCE|VERSINFO)=/d; + /^(UID|EUID)=/d; + /^(FUNCNAME|GROUPS|PPID|SHELLOPTS)=/d;' >"${state_dir}/env.sh" CT_DoLog DEBUG " Saving CT_CC_CORE_STATIC_PREFIX_DIR='${CT_CC_CORE_STATIC_PREFIX_DIR}'" CT_Pushd "${CT_CC_CORE_STATIC_PREFIX_DIR}" -- cgit v0.10.2-6-g49f6