From 8f7b2b5cc15e1c6792e6bac7fa74bd4a4d771e33 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 30 May 2003 21:25:38 +0000 Subject: [PATCH] Quote $srcdir to handle $srcdir with spaces (#107850, Evan Martin) Fri May 30 17:24:23 2003 Owen Taylor * glib-gettextize.in: Quote $srcdir to handle $srcdir with spaces (#107850, Evan Martin) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib-gettextize.in | 22 +++++++++++----------- 7 files changed, 41 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34d3c06..8275f62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri May 30 17:24:23 2003 Owen Taylor + + * glib-gettextize.in: Quote $srcdir to handle $srcdir + with spaces (#107850, Evan Martin) + Fri May 30 16:48:26 2003 Owen Taylor * glib/giochannel.c (g_io_channel_error_from_errno): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 34d3c06..8275f62 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri May 30 17:24:23 2003 Owen Taylor + + * glib-gettextize.in: Quote $srcdir to handle $srcdir + with spaces (#107850, Evan Martin) + Fri May 30 16:48:26 2003 Owen Taylor * glib/giochannel.c (g_io_channel_error_from_errno): diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 34d3c06..8275f62 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Fri May 30 17:24:23 2003 Owen Taylor + + * glib-gettextize.in: Quote $srcdir to handle $srcdir + with spaces (#107850, Evan Martin) + Fri May 30 16:48:26 2003 Owen Taylor * glib/giochannel.c (g_io_channel_error_from_errno): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 34d3c06..8275f62 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri May 30 17:24:23 2003 Owen Taylor + + * glib-gettextize.in: Quote $srcdir to handle $srcdir + with spaces (#107850, Evan Martin) + Fri May 30 16:48:26 2003 Owen Taylor * glib/giochannel.c (g_io_channel_error_from_errno): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 34d3c06..8275f62 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri May 30 17:24:23 2003 Owen Taylor + + * glib-gettextize.in: Quote $srcdir to handle $srcdir + with spaces (#107850, Evan Martin) + Fri May 30 16:48:26 2003 Owen Taylor * glib/giochannel.c (g_io_channel_error_from_errno): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 34d3c06..8275f62 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri May 30 17:24:23 2003 Owen Taylor + + * glib-gettextize.in: Quote $srcdir to handle $srcdir + with spaces (#107850, Evan Martin) + Fri May 30 16:48:26 2003 Owen Taylor * glib/giochannel.c (g_io_channel_error_from_errno): diff --git a/glib-gettextize.in b/glib-gettextize.in index e205c56..f424f8b 100644 --- a/glib-gettextize.in +++ b/glib-gettextize.in @@ -83,7 +83,7 @@ fi # Fill in the command line options value. if test $# -eq 1; then srcdir=$1 - if cd $srcdir; then + if cd "$srcdir"; then srcdir=`pwd` else $echo "Cannot change directory to \`$srcdir'" @@ -124,9 +124,9 @@ for file in *; do intl | po) ;; *) - rm -f $srcdir/$file - ($try_ln_s && ln -s $gettext_dir/$file $srcdir/$file && $echo "Symlinking file $file") 2>/dev/null || - { $echo "Copying file $file"; cp $file $srcdir/$file; } + rm -f "$srcdir/$file" + ($try_ln_s && ln -s $gettext_dir/$file "$srcdir/$file" && $echo "Symlinking file $file") 2>/dev/null || + { $echo "Copying file $file"; cp $file "$srcdir/$file"; } ;; esac done @@ -134,17 +134,17 @@ done # Copy files to po/ subdirectory. cd po for file in *; do - rm -f $srcdir/po/$file - ($try_ln_s && ln -s $gettext_dir/po/$file $srcdir/po/$file && $echo "Symlinking file po/$file") 2>/dev/null || - { $echo "Copying file po/$file"; cp $file $srcdir/po/$file; } + rm -f "$srcdir/po/$file" + ($try_ln_s && ln -s $gettext_dir/po/$file "$srcdir/po/$file" && $echo "Symlinking file po/$file") 2>/dev/null || + { $echo "Copying file po/$file"; cp $file "$srcdir/po/$file"; } done -if test -f $srcdir/po/cat-id-tbl.c; then +if test -f "$srcdir/po/cat-id-tbl.c"; then $echo "Removing po/cat-id-tbl.c" - rm -f $srcdir/po/cat-id-tbl.c + rm -f "$srcdir/po/cat-id-tbl.c" fi -if test -f $srcdir/po/stamp-cat-id; then +if test -f "$srcdir/po/stamp-cat-id"; then $echo "Removing po/stamp-cat-id" - rm -f $srcdir/po/stamp-cat-id + rm -f "$srcdir/po/stamp-cat-id" fi echo -- 2.7.4