summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-01-08 20:06:34 -0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-10 13:37:11 +0100
commit8bd68a248358ddc9c151dfe560c43aa40372f565 (patch)
tree1e45a62fe81edc77355e496f707aee7166d1eb01
parent6d6499c3d638cf288dc4aa6f634b18c8d62bcaa3 (diff)
Change the zsh sourcing again to remove the sub-shell command.
This uses the following zsh expansion tricks: ${:-word} always replace by "word" (%) modifier expand %-escapes like in PS1 %pattern strip shortest matching pattern from the end %x is the name of the current script or sourced file; the /* pattern strips the last component from a file path. Change-Id: Ie29a06bd164b36b820342c3c3178e387389de29d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
-rw-r--r--scripts/qtchooser.zsh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qtchooser.zsh b/scripts/qtchooser.zsh
index d1129c9..f53f863 100644
--- a/scripts/qtchooser.zsh
+++ b/scripts/qtchooser.zsh
@@ -36,7 +36,7 @@
## $QT_END_LICENSE$
##
-source ${${(%)$(echo %x)}%/*}/common.sh
+source ${${(%):-%x}%/*}/common.sh
function qt_env_removefrom()
{