From: Richard Heck <rgheck@comcast.net>
Date: Thu, 16 Jun 2011 15:35:46 +0000 (+0000)
Subject: Port changes to update-po.sh.
X-Git-Tag: 2.1.0beta1~3041
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ed9b6f935bcad8245d63f1369342c5efcc6a51f3;p=lyx.git

Port changes to update-po.sh.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39109 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/tools/check-po.sh b/development/tools/check-po.sh
deleted file mode 100644
index 9aa662ceb7..0000000000
--- a/development/tools/check-po.sh
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-# A script to check whether there have been any string changes.
-
-# The script expects an environment variable FARM that 
-# will provide it with the location of the LyX www tree.
-
-DEBUG="echo";
-
-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";
-  exit 1;
-fi
-
-FARM=${FARM%/};
-FARM="$FARM/farm/cookbook/LyX";
-# Sanity check
-if [ ! -f "$FARM/i18n.php" ]; then 
-  echo "$FARM does not look like LyX's www tree!";
-  exit 1;
-fi
-
-# Get us to the root of the tree we are in.
-MYDIR=${0%check-po.sh};
-if [ -n "$MYDIR" ]; then
-  cd $MYDIR;
-fi
-cd ../../;
-LYXROOT=$(pwd);
-
-# Are we in trunk or branch?
-TRUNK="TRUE";
-if ls status.* 2>/dev/null | grep -q status; then 
-  TRUNK="";
-fi
-
-# Git or SVN?
-VCS="";
-if svn log >/dev/null 2>&1; then
-  VCS="svn";
-else if git diff >/dev/null 2>&1; then
-  VCS="git";
-fi
-
-if [ -n "$VCS" ]; then 
-  echo "Unable to determine version control system!";
-  exit 1;
-fi
-
-# Sanity check
-if ! cd po/; then 
-  echo "Cannot cd to po/ directory!";
-  pwd
-  exit 1;
-fi
-
-echo Remerging...
-make update-po >/dev/null 2>&1;
-echo
-
-echo Running make i18n.inc...
-make i18n.inc  >/dev/null 2>&1;
-if [ -n "$TRUNK" ]; then
-  mv i18n.inc i18n_trunk.inc
-  I18NFILE=i18n_trunk.inc;
-else
-  I18NFILE=i18n.inc;
-fi
-
-if diff -w -q $I18NFILE $FARM/$I18NFILE >/dev/null; then
-  # No differences found
-  echo No string differences found.
-  if [ "$VCS" = "svn" ]; then
-    svn revert *.po  >/dev/null 2>&1;
-  else
-    git co *.po >/dev/null 2>&1;
-  fi
-  exit 0;
-fi
-
-# else
-if [ "$VCS" = "svn" ]; then
-  $DEBUG svn ci *.po;
-else
-  $DEBUG git commit *.po -m "Remerge strings.";
-  # I think probably we shouldn't try to push/commit to remote.
-  echo "You will need to commit changes to po files manually."
-fi
-
-if ! cd $FARM; then
-  echo "Unable to cd to $FARM!";
-  exit 1;
-fi
-echo
-echo Updating the www-user tree...
-# note that we're assuming this one is svn.
-svn up >/dev/null 2>&1;
-
-echo Copying $I18NFILE...;
-cp $LYXROOT/po/$I18NFILE .;
-
-echo Committing...;
-svn commit -m "* $I18NFILE: update stats" $I18NFILE;
-
-echo DONE!
diff --git a/development/tools/update-po.sh b/development/tools/update-po.sh
new file mode 100644
index 0000000000..c89ae227a6
--- /dev/null
+++ b/development/tools/update-po.sh
@@ -0,0 +1,138 @@
+#!/bin/sh
+# A script to check whether there have been any string changes.
+# If it finds some, it commits the new po files and then updates
+# the stats.
+
+# The script expects an environment variable FARM that will provide 
+# it with the location of the LyX www tree.
+
+DEBUG="";
+
+while getopts ":dh" options $ARGS; do
+  case $options in
+    d)  DEBUG="echo";;
+    h)  echo "check-po.sh [-d]"; 
+        echo "You must also point the FARM variable to LyX's www tree."; 
+        exit 0;;
+  esac
+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";
+  exit 1;
+fi
+
+FARM=${FARM%/};
+FARM="$FARM/farm/cookbook/LyX";
+# Sanity check
+if [ ! -f "$FARM/i18n.php" ]; then 
+  echo "$FARM does not look like LyX's www tree!";
+  exit 1;
+fi
+
+# Get us to the root of the tree we are in.
+MYDIR=${0%check-po.sh};
+if [ -n "$MYDIR" ]; then
+  cd $MYDIR;
+fi
+cd ../../;
+LYXROOT=$(pwd);
+
+# Are we in trunk or branch?
+TRUNK="TRUE";
+if ls status.* 2>/dev/null | grep -q status; then 
+  TRUNK="";
+fi
+
+# Git or SVN?
+VCS="";
+if svn log >/dev/null 2>&1; then
+  VCS="svn";
+elif git diff >/dev/null 2>&1; then
+  VCS="git";
+fi
+
+if [ -z "$VCS" ]; then 
+  echo "Unable to determine version control system!";
+  exit 1;
+fi
+
+# Sanity check
+if ! cd po/; then 
+  echo "Cannot cd to po/ directory!";
+  pwd
+  exit 1;
+fi
+
+echo Remerging...
+make update-po >/dev/null 2>&1;
+echo
+
+if [ -n "$TRUNK" ]; then
+  I18NFILE=i18n_trunk.inc;
+else
+  I18NFILE=i18n.inc;
+fi
+
+# make sure things are clean
+rm -f i18n.inc;
+svn revert $FARM/$I18NFILE;
+
+echo Running make i18n.inc...
+make i18n.inc  >/dev/null 2>&1;
+if [ -n "$TRUNK" ]; then
+  mv -f i18n.inc i18n_trunk.inc
+fi
+
+if diff -w -q $I18NFILE $FARM/$I18NFILE >/dev/null 2>&1; then
+  echo No string differences found.
+  # So we will revert the changes to po files, which are probably
+  # just dates and such.
+  if [ "$VCS" = "svn" ]; then
+    svn revert *.po;
+  else
+    git checkout *.po;
+  fi
+  exit 0;
+fi
+
+# So there are differences.
+if [ "$VCS" = "svn" ]; then
+  $DEBUG svn ci *.po;
+else
+  # We need to make sure that we have a tree without any unpushed 
+  # commits. Otherwise git svn dcommit would commit more than we
+  # want.
+  NOTSAFE="";
+  if git status | grep -Pq 'Your branch is (?:ahead|behind)'; then
+    NOTSAFE="TRUE";
+  fi
+  $DEBUG git commit *.po -m "Remerge strings.";
+  if [ -z "$NOTSAFE" ]; then
+    $DEBUG git svn dcommit;
+  fi
+fi
+
+echo
+
+if ! cd $FARM; then
+  echo "Unable to cd to $FARM!";
+  exit 1;
+fi
+
+echo Updating the www-user tree...
+# note that we're assuming this one is svn.
+svn up;
+
+echo Moving $I18NFILE...;
+mv $LYXROOT/po/$I18NFILE .;
+
+echo Committing...;
+$DEBUG svn commit -m "* $I18NFILE: update stats" $I18NFILE;
+
+if [ -n "$NOTSAFE" ]; then
+  echo
+  echo "Your LyX tree was not clean.";
+  echo "Your will need to push changes to po files manually."
+fi