diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-05-02 11:35:29 +0200 |
---|---|---|
committer | X2go Administrator <x2go-admin@minobo.das-netzwerkteam.de> | 2011-05-02 11:35:29 +0200 |
commit | 0912b982cd047161cf5c8496c2980137fc22d068 (patch) | |
tree | e8d09d7881a28ee97098a4cee9f5c7caf424af8c | |
parent | 89fc36d4c900a17aa1d3b9c8f74e54ec1392589c (diff) | |
download | buildscripts-0912b982cd047161cf5c8496c2980137fc22d068.tar.gz buildscripts-0912b982cd047161cf5c8496c2980137fc22d068.tar.bz2 buildscripts-0912b982cd047161cf5c8496c2980137fc22d068.zip |
silencing script output
-rwxr-xr-x | bin/x2go-pkgneedsbuild | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/x2go-pkgneedsbuild b/bin/x2go-pkgneedsbuild index bc94c96..33593e9 100755 --- a/bin/x2go-pkgneedsbuild +++ b/bin/x2go-pkgneedsbuild @@ -17,7 +17,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -set -xe +set -e CHECKOUT=${1:-master} @@ -27,20 +27,20 @@ DATE=$(date +%s) CURRENT_BRANCH=$(git branch | grep "*" | awk '{print $2}') # switch to branch given as $CHECKOUT, if it does not exist locally, create it... -git checkout $CHECKOUT || git checkout -b $CHECKOUT +git checkout $CHECKOUT &>/dev/null || git checkout -b $CHECKOUT >/dev/null # switch to a tmp branch... -git checkout -b tmp-$DATE +git checkout -b tmp-$DATE &>/dev/null # pull $CHECKOUT from origin into the tmp branch LANG=en_US.UTF-8 git pull origin $CHECKOUT 2>/dev/null | egrep "^Already up-to-date.$" &>/dev/null && { # drop the tmp branch - git checkout $CURRENT_BRANCH - git branch -D tmp-$DATE + git checkout $CURRENT_BRANCH &>/dev/null + git branch -D tmp-$DATE >/dev/null exit 1 } || { # drop the tmp branch - git checkout $CURRENT_BRANCH - git branch -D tmp-$DATE + git checkout $CURRENT_BRANCH &>/dev/null + git branch -D tmp-$DATE >/dev/null exit 0 } |