Amend b8502a3ea2735c4

[lyx.git] / development / tools / updatestats.sh

diff --git a/development/tools/updatestats.sh b/development/tools/updatestats.sh
old mode 100644 (file)
new mode 100755 (executable)
index 4fdf28a..92970ce
--- a/development/tools/updatestats.sh
+++ b/development/tools/updatestats.sh
@@ -21,14 +21,14 @@ fi
 # Get us to the root of the tree we are in.
 MYDIR=${0%updatestats.sh};
 if [ -n "$MYDIR" ]; then
-  cd $MYDIR;
+  cd "$MYDIR";
 fi
 cd ../../;
 LYXROOT=$(pwd);
 
 # Are we in trunk or branch?
 TRUNK="TRUE";
-if ls status.* 2>/dev/null | grep -q status; then 
+if ls status.* 2>/dev/null; then 
   TRUNK="";
 fi
 
@@ -48,19 +48,28 @@ else
   I18NFILE=i18n.inc;
 fi
 
-if ! cd $FARM; then
+if ! cd "$FARM"; then
   echo "Unable to cd to $FARM!";
   exit 1;
 fi
 
+# Are we under svn or git?
+GIT="";
+if [ -d .git/ ]; then GIT="TRUE"; fi
+
 echo
 echo Updating the www-user tree...
 svn up
 
 echo Copying $I18NFILE...;
-cp $LYXROOT/po/$I18NFILE .;
+cp "$LYXROOT/po/$I18NFILE" .;
 
 echo Committing...;
-svn commit -m "* $I18NFILE: update stats" $I18NFILE;
+if [ -z "$GIT" ]; then
+  svn commit -m "* $I18NFILE: update stats" $I18NFILE;
+else
+  git commit -m "* $I18NFILE: update stats" $I18NFILE;
+  git svn dcommit;
+fi
 
 echo DONE!