From f55e43b90c44ec530dc8ae5185505c580e6f0e62 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Thu, 18 Jan 2007 16:05:13 +0000 Subject: [PATCH] Bug 367127 - Make mozconfig-find space-safe (e.g. spaces in C:\Documents and Settings\bsmedberg), r=dbaron git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_0_BRANCH@218595 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/build/autoconf/mozconfig-find | 22 +++++++++++----------- mozilla/build/autoconf/mozconfig2client-mk | 2 +- mozilla/build/autoconf/mozconfig2configure | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mozilla/build/autoconf/mozconfig-find b/mozilla/build/autoconf/mozconfig-find index ecc7b5d0aa1..2e9d79517c5 100755 --- a/mozilla/build/autoconf/mozconfig-find +++ b/mozilla/build/autoconf/mozconfig-find @@ -46,18 +46,18 @@ # topsrcdir=$1 -for _config in $MOZCONFIG \ - $MOZ_MYCONFIG \ - $topsrcdir/.mozconfig \ - $topsrcdir/mozconfig \ - $topsrcdir/mozconfig.sh \ - $topsrcdir/myconfig.sh \ - $HOME/.mozconfig \ - $HOME/.mozconfig.sh \ - $HOME/.mozmyconfig.sh +for _config in "$MOZCONFIG" \ + "$MOZ_MYCONFIG" \ + "$topsrcdir/.mozconfig" \ + "$topsrcdir/mozconfig" \ + "$topsrcdir/mozconfig.sh" \ + "$topsrcdir/myconfig.sh" \ + "$HOME/.mozconfig" \ + "$HOME/.mozconfig.sh" \ + "$HOME/.mozmyconfig.sh" do - if test -f $_config; then - echo $_config; + if test -f "$_config"; then + echo "$_config"; exit 0 fi done diff --git a/mozilla/build/autoconf/mozconfig2client-mk b/mozilla/build/autoconf/mozconfig2client-mk index 0801e340837..6b06dd88d96 100755 --- a/mozilla/build/autoconf/mozconfig2client-mk +++ b/mozilla/build/autoconf/mozconfig2client-mk @@ -101,7 +101,7 @@ echo "# PATH=$PATH" >> $tmp_file if [ "$MOZCONFIG" ] then - . $MOZCONFIG + . "$MOZCONFIG" fi if [ "$opts" ]; then diff --git a/mozilla/build/autoconf/mozconfig2configure b/mozilla/build/autoconf/mozconfig2configure index 99750ecf85c..50e0b02487a 100755 --- a/mozilla/build/autoconf/mozconfig2configure +++ b/mozilla/build/autoconf/mozconfig2configure @@ -115,7 +115,7 @@ done MOZCONFIG=`$_AUTOCONF_TOOLS_DIR/mozconfig-find $topsrcdir` if [ "$MOZCONFIG" ]; then - . $MOZCONFIG + . "$MOZCONFIG" fi if [ "$mozconfig_ac_options" ]; then