From 18850a18f1a693697ecd4caad8a1eb608f442401 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 18 Apr 2005 18:14:58 +0000 Subject: [PATCH] (gnulib_modules): Don't create a file modlist.tmp, as it is sometimes left behind as a garbage file (maybe due to the multiple traps?). --- bootstrap | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/bootstrap b/bootstrap index bd0939a..0423362 100755 --- a/bootstrap +++ b/bootstrap @@ -162,12 +162,16 @@ checkout() { fi } -# Prepare temporary module list -cat /dev/null > modlist.tmp -trap 'rm -f modlist.tmp' 0 1 2 13 15 +gnulib_modules= +newline=' +' get_modules() { - sed '/^[ ]*#/d;/^[ ]*$/d' $* >> modlist.tmp + new_gnulib_modules=`sed '/^[ ]*#/d; /^[ ]*$/d' $*` + case $gnulib_modules,$new_gnulib_modules in + ?*,?*) new_gnulib_modules=$newline$new_gnulib_modules;; + esac + gnulib_modules=$gnulib_modules$new_gnulib_modules } # Get paxutils files @@ -223,7 +227,7 @@ esac get_modules gnulib.modules -gnulib_modules=`sort -u modlist.tmp` +gnulib_modules=`echo "$gnulib_modules" | sort -u` previous_gnulib_modules= while [ "$gnulib_modules" != "$previous_gnulib_modules" ]; do previous_gnulib_modules=$gnulib_modules -- 2.44.0