From 8d6c84393fd54cdecc88dc8c927ba5770ae1611c Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 12 Mar 2016 02:26:09 +0100 Subject: [PATCH] Import newer version of the script upstream --- po/gettext.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/po/gettext.sh b/po/gettext.sh index c3ae919..5bb7c9b 100755 --- a/po/gettext.sh +++ b/po/gettext.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2010-2014 Pierre Pronchery +#Copyright (c) 2010-2015 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -29,6 +29,7 @@ PREFIX="/usr/local" [ -f "../config.sh" ] && . "../config.sh" LOCALEDIR="$PREFIX/share/locale" POTFILES="POTFILES" +PROGNAME="gettext.sh" #executables DEBUG="_debug" INSTALL="install -m 0644" @@ -44,7 +45,7 @@ XGETTEXT="xgettext --force-po" #debug _debug() { - echo "$@" 1>&2 + echo "$@" 1>&3 "$@" } @@ -52,7 +53,7 @@ _debug() #error _error() { - echo "gettext.sh: $@" 1>&2 + echo "$PROGNAME: $@" 1>&2 return 2 } @@ -60,7 +61,7 @@ _error() #usage _usage() { - echo "Usage: gettext.sh [-c|-i|-u][-P prefix] target..." 1>&2 + echo "Usage: $PROGNAME [-c|-i|-u][-P prefix] target..." 1>&2 return 1 } @@ -146,6 +147,7 @@ if [ -z "$PACKAGE" ]; then fi LOCALEDIR="$PREFIX/share/locale" +exec 3>&1 while [ $# -gt 0 ]; do target="$1" source="${target#$OBJDIR}"