summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Cornellà <marc.cornella@live.com>2014-10-09 13:55:50 +0200
committerMarc Cornellà <marc.cornella@live.com>2014-11-06 18:33:56 +0100
commit4310a15de5d0587ef135f9e12857620c4788dec2 (patch)
tree2b90a55294191a4c3f4d7b5c037476f6f2470796
parent74177c5320b2a1b2f8c4c695c05984b57fd7c6ea (diff)
downloadzsh-4310a15de5d0587ef135f9e12857620c4788dec2.tar.gz
zsh-4310a15de5d0587ef135f9e12857620c4788dec2.tar.bz2
zsh-4310a15de5d0587ef135f9e12857620c4788dec2.zip
Change all pwd calls for $PWD variable
This avoids spawning additional processes as $PWD **always** contains the current working directory.
-rw-r--r--plugins/dirhistory/dirhistory.plugin.zsh6
-rw-r--r--plugins/jump/jump.plugin.zsh6
-rw-r--r--plugins/pow/pow.plugin.zsh8
-rw-r--r--plugins/svn/svn.plugin.zsh2
-rw-r--r--plugins/systemadmin/systemadmin.plugin.zsh2
-rw-r--r--plugins/vim-interaction/vim-interaction.plugin.zsh2
6 files changed, 13 insertions, 13 deletions
diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 504d7ec14..d101cfcae 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -3,7 +3,7 @@
# that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT.
#
-dirhistory_past=(`pwd`)
+dirhistory_past=($PWD)
dirhistory_future=()
export dirhistory_past
export dirhistory_future
@@ -50,7 +50,7 @@ function push_future() {
# Called by zsh when directory changes
function chpwd() {
- push_past `pwd`
+ push_past $PWD
# If DIRHISTORY_CD is not set...
if [[ -z "${DIRHISTORY_CD+x}" ]]; then
# ... clear future.
@@ -73,7 +73,7 @@ function dirhistory_back() {
pop_past cw
if [[ "" == "$cw" ]]; then
# Someone overwrote our variable. Recover it.
- dirhistory_past=(`pwd`)
+ dirhistory_past=($PWD)
return
fi
diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index 1b23b5d42..b16814fe4 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -14,12 +14,12 @@ jump() {
mark() {
if (( $# == 0 )); then
- MARK=$(basename "$(pwd)")
+ MARK=$(basename "$PWD")
else
MARK="$1"
fi
- if read -q \?"Mark $(pwd) as ${MARK}? (y/n) "; then
- mkdir -p "$MARKPATH"; ln -s "$(pwd)" "$MARKPATH/$MARK"
+ if read -q \?"Mark $PWD as ${MARK}? (y/n) "; then
+ mkdir -p "$MARKPATH"; ln -s "$PWD" "$MARKPATH/$MARK"
fi
}
diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index d85c88777..ded3336a7 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -21,13 +21,13 @@
rack_root(){
setopt chaselinks
- local orgdir="$(pwd)"
- local basedir="$(pwd)"
+ local orgdir="$PWD"
+ local basedir="$PWD"
while [[ $basedir != '/' ]]; do
test -e "$basedir/config.ru" && break
builtin cd ".." 2>/dev/null
- basedir="$(pwd)"
+ basedir="$PWD"
done
builtin cd "$orgdir" 2>/dev/null
@@ -56,7 +56,7 @@ kapow(){
compctl -W ~/.pow -/ kapow
powit(){
- local basedir="$(pwd)"
+ local basedir="$PWD"
local vhost=$1
[ ! -n "$vhost" ] && vhost=$(rack_root_detect)
if [ ! -h ~/.pow/$vhost ]
diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index ef6da5bd3..ba281d790 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -77,7 +77,7 @@ function svn_dirty() {
function svn_dirty_choose_pwd () {
if in_svn; then
- root=`pwd`
+ root=$PWD
if $(svn status $root 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'); then
# Grep exits with 0 when "One or more lines were selected", return "dirty".
echo $1
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index e0b1773ad..4ae70dfa7 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -30,7 +30,7 @@ function retlog() {
}
alias ping='ping -c 5'
-alias clr='clear;echo "Currently logged in on $(tty), as $USER in directory $(pwd)."'
+alias clr='clear;echo "Currently logged in on $(tty), as $USER in directory $PWD."'
alias path='echo -e ${PATH//:/\\n}'
alias mkdir='mkdir -pv'
# get top process eating memory
diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 5142f1f9b..b0b9414cd 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -9,7 +9,7 @@ function resolveFile
if [ -f "$1" ]; then
echo $(readlink -f "$1")
elif [[ "${1#/}" == "$1" ]]; then
- echo "$(pwd)/$1"
+ echo "$PWD/$1"
else
echo $1
fi