From 231f984a5807dc4f441908f8038b65b453681658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 16 Dec 2002 21:04:04 +0000 Subject: [PATCH] lang/sync_lang.sh also now works with POSIX sh --- ChangeLog | 2 +- lang/sync_lang.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 422373103..3dd685489 100755 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,7 @@ $Id$ $Source$ 2002-12-13 Michal Cihar - * lang/sort_lang.sh: Make it work with POSIX sh. + * lang/{sort_lang.sh,sync_lang.sh}: Make it work with POSIX sh. 2002-12-16 Marc Delisle * lang/russian: update, thanks to Nicolay Zakharov diff --git a/lang/sync_lang.sh b/lang/sync_lang.sh index cce3cd79f..74c4704bf 100755 --- a/lang/sync_lang.sh +++ b/lang/sync_lang.sh @@ -28,11 +28,13 @@ # CONVERTOR_PARAMS is used for printf and it also receives two params: source # and target charset # + case "$1" in --iconv) echo Using iconv on user request CONVERTOR=iconv - CONVERTOR_PARAMS="-f %s -t %s" + # the space on following is REQUIRED + CONVERTOR_PARAMS=" -f %s -t %s" shift ;; --recode) @@ -159,16 +161,16 @@ for base in $BASE_TRANSLATIONS ; do if [ $charset = 'utf-8' ] ; then # if we convert to utf-8, we should add allow_recoding is_utf=yes - $CONVERTOR $(printf -- "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php3| sed -e "s/$src_charset/$charset/" -e '/\$charset/a\ + $CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php3| sed -e "s/$src_charset/$charset/" -e '/\$charset/a\ $allow_recoding = TRUE;' > $file echo done elif [ $src_charset = 'utf-8' ] ; then # if we convert from utf-8, we should remove allow_recoding - $CONVERTOR $(printf -- "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php3| grep -v allow_recoding > $file + $CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php3| grep -v allow_recoding > $file echo done else # just convert - $CONVERTOR $(printf -- "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php3| sed "s/$src_charset/$charset/" > $file + $CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php3| sed "s/$src_charset/$charset/" > $file echo done fi done