diff --git a/development/tools/update-po.sh b/development/tools/update-po.sh index 596c3fbbe9..25be194359 100755 --- a/development/tools/update-po.sh +++ b/development/tools/update-po.sh @@ -26,7 +26,7 @@ done if [ -z "$FARM" ]; then echo "You must set the FARM variable to run this script, e.g.:"; - echo "# FARM=/cvs/lyx-www/ bash check-po.sh"; + echo "# FARM=/cvs/lyx-www/ bash update-po.sh"; exit 1; fi @@ -93,7 +93,7 @@ fi if diff -w -q "$I18NFILE $FARM/$I18NFILE" >/dev/null 2>&1; then echo No string differences found. - git checkout ./*.po; + git checkout ./*.po ./*.gmo; exit 0; fi @@ -138,11 +138,13 @@ if ! cd "$FARM"; then fi echo Updating the www-user tree... -# note that we're assuming this one is svn. -svn up; +if ! git pull; then + echo "Problem updating www-user tree"; + exit 1; +fi echo Moving $I18NFILE...; mv "$LYXROOT/po/$I18NFILE" .; echo Committing...; -$DEBUG svn commit -m "* $I18NFILE: update stats" $I18NFILE; +$DEBUG git commit -m "* $I18NFILE: update stats" $I18NFILE;