From 29dd8b5548ce047ce51ff9a73d6c4b50c9886771 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 2 Oct 2008 11:03:52 +0200 Subject: [PATCH] allow renaming bootstrap, and change the name of bootstrap.conf accordingly 2008-10-02 Paolo Bonzini * build-aux/bootstrap: Allow renaming bootstrap, and change the name of bootstrap.conf accordingly. --- ChangeLog | 5 +++++ build-aux/bootstrap | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ead2fe8e..59e9bd044 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-10-02 Paolo Bonzini + * build-aux/bootstrap: Allow renaming bootstrap, and change the + name of bootstrap.conf accordingly. + +2008-10-02 Paolo Bonzini + * build-aux/bootstrap: Install git-merge-changelog configuration items into .gitconfig if needed. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 93fe859ef..1134a6518 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -49,7 +49,7 @@ Options: not to have been checked out. --skip-po Do not download po files. -If the file bootstrap.conf exists in the current working directory, its +If the file $0.conf exists in the same directory as this script, its contents are read as shell variables to configure the bootstrap. Running without arguments will suffice in most cases. @@ -146,7 +146,13 @@ copy=false vc_ignore=auto # Override the default configuration, if necessary. -test -r bootstrap.conf && . ./bootstrap.conf +# Make sure that bootstrap.conf is sourced from the current directory +# if we were invoked as "sh bootstrap". +case "$0" in + */*) test -r "$0.conf" && . "$0.conf" ;; + *) test -r "$0.conf" && . ./"$0.conf" ;; +esac + if test "$vc_ignore" = auto; then vc_ignore= -- 2.11.0