From 2781f054160c427a69b7b32fa0e339823d0a2e2a Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 2 Jun 2008 07:50:13 +0000 Subject: [PATCH] Removed the need to specify "plugin" or "core". Just use the "plugin.dsc" as a detector. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11131 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/update-locale | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gosa-core/update-locale b/gosa-core/update-locale index e93a24706..fce0d7db3 100755 --- a/gosa-core/update-locale +++ b/gosa-core/update-locale @@ -38,7 +38,8 @@ generate_po() { for f in locale/${l_path}??/LC_MESSAGES; do [[ "$f" == "locale/${l_path}??/LC_MESSAGES" ]] && break echo -n "* merging $f/messages.po: " - [ -f $f/messages.po ] && msgmerge $f/messages.po locale/${l_path}messages.po --output-file=$f/messages.po.new &> /dev/null + [ ! -f $f/messages.po ] && touch $f/messages.po + msgmerge $f/messages.po locale/${l_path}messages.po --output-file=$f/messages.po.new &> /dev/null # Do an extra check for dummy dir 'locale/en/LC_MESSAGES' if [ $? -ne 0 ]; then @@ -123,8 +124,7 @@ do y) ASSUME_Y=1; ;; h|--help) - echo "Usage: $(basename $0) [-g] [-y] method" - echo " method can be 'core' or 'plugin'" + echo "Usage: $(basename $0) [-g] [-y]" echo " -g extract strings from GOsa and generate po files" echo " -y assume yes" exit 1 @@ -133,12 +133,8 @@ do done shift $(($OPTIND - 1)) -# Check method -if [ "$1" != "plugin" -a "$1" != "core" ]; then - echo "Need explicit method 'core' or 'plugin' to create locale." - exit 1 -fi -if [ "$1" == "plugin" ]; then +# If there's a plugin.dsc in ., then assume "plugin" +if [ -f plugin.dsc ]; then l_path="" else l_path="core/" -- 2.30.2