summaryrefslogtreecommitdiff
path: root/.zsh/functions
diff options
context:
space:
mode:
authorRené Neumann <rene.neumann@in.tum.de>2012-02-23 19:13:44 +0100
committerRené Neumann <rene.neumann@in.tum.de>2012-02-23 19:13:45 +0100
commita55b3ac88629bd7d3de5f5edd45f85c9db32b673 (patch)
tree519f0b8641cd2f43395454600fd1a0f8dd880cac /.zsh/functions
parenta055466194af82ea617ab8e265806e68a3856247 (diff)
downloaddotfiles-a55b3ac88629bd7d3de5f5edd45f85c9db32b673.tar.gz
dotfiles-a55b3ac88629bd7d3de5f5edd45f85c9db32b673.tar.bz2
dotfiles-a55b3ac88629bd7d3de5f5edd45f85c9db32b673.zip
Make the stg-version into a variable ... no need to run python multiple times
Diffstat (limited to '.zsh/functions')
-rw-r--r--.zsh/functions/cci11
1 files changed, 5 insertions, 6 deletions
diff --git a/.zsh/functions/cci b/.zsh/functions/cci
index 6d10917..22441d7 100644
--- a/.zsh/functions/cci
+++ b/.zsh/functions/cci
@@ -13,11 +13,6 @@ _ask_$0 ()
fi
}
-_stg_v_$0 ()
-{
- python -c 'from stgit.builtin_version import version; print version'
-}
-
if [[ $# == 0 ]]; then
echo "No message given. Aborting."
return 1
@@ -25,6 +20,10 @@ fi
local message=$1
local tok=__cci__
+local stg_v=$(python -c 'from stgit.builtin_version import version; print version')
+
+# bail out on errors with the python thing
+(( $? )) && return
pushd -q ~
@@ -64,7 +63,7 @@ cstg commit $tok || return
# from 0.16 onwards stg repushes the patches ... pop them again
# this is needed to make the `config push` work
-if is-at-least 0.16 $(_stg_v_$0); then
+if is-at-least 0.16 $stg_v; then
echo ">>> Popping patches, stg thought it had to re-apply"
cstg pop -a -k || return
fi