From 28d4c0a14a8f4b66d9d0f03e55097c22280b8fdd Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Wed, 16 Nov 2011 12:42:16 +0100
Subject: Fixed branch keeping

---
 README | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 7d06d5c..db3b9c0 100644
--- a/README
+++ b/README
@@ -31,12 +31,12 @@ otconfig() {
   source $HOME/.opentox-ui.sh
 }
 
-# Update the development version
+# Update the version
 otupdate() {
   START_DIR=`pwd`
   otconfig
   cd $HOME/opentox-ruby/www/opentox
-  for d in `find -not -name "." -type d -maxdepth 1 2>/dev/null`; do echo $d ; cd $d ; git pull  ; echo ; cd - ;  done
+  for d in `find -not -name "." -type d -maxdepth 1 2>/dev/null`; do echo ; echo $d ; cd $d ; MYBRANCH=`git branch | grep "*" | sed 's/.*\ //g'`; git pull origin $MYBRANCH ; cd - ;  done
   cd  $HOME/opentox-ruby/www/opentox/algorithm/libfminer
   mv libbbrc/Makefile libbbrc/Makefile~
   mv liblast/Makefile liblast/Makefile~
@@ -102,3 +102,4 @@ otkill() {
   while ps x | grep Rack | grep -v grep >/dev/null 2>&1; do sleep 1; done
   for p in `pgrep -u $USER R 2>/dev/null`; do kill -9 $p; done
 }
+
-- 
cgit v1.2.3