summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2011-11-16 12:42:16 +0100
committerAndreas Maunz <andreas@maunz.de>2011-11-16 12:42:16 +0100
commit28d4c0a14a8f4b66d9d0f03e55097c22280b8fdd (patch)
treedf06f562a2496d6d6d24a5fcdf3deafdceadfaff
parent2ddf9dd65a657a3ecf5a636e8e3f66fad581ab6a (diff)
Fixed branch keeping
-rw-r--r--README5
1 files 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
}
+