Commit 4310a15d authored by Marc Cornellà's avatar Marc Cornellà
Browse files

Change all pwd calls for $PWD variable

This avoids spawning additional processes as $PWD **always** contains
the current working directory.
parent 74177c53
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT. # that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT.
# #
dirhistory_past=(`pwd`) dirhistory_past=($PWD)
dirhistory_future=() dirhistory_future=()
export dirhistory_past export dirhistory_past
export dirhistory_future export dirhistory_future
...@@ -50,7 +50,7 @@ function push_future() { ...@@ -50,7 +50,7 @@ function push_future() {
# Called by zsh when directory changes # Called by zsh when directory changes
function chpwd() { function chpwd() {
push_past `pwd` push_past $PWD
# If DIRHISTORY_CD is not set... # If DIRHISTORY_CD is not set...
if [[ -z "${DIRHISTORY_CD+x}" ]]; then if [[ -z "${DIRHISTORY_CD+x}" ]]; then
# ... clear future. # ... clear future.
...@@ -73,7 +73,7 @@ function dirhistory_back() { ...@@ -73,7 +73,7 @@ function dirhistory_back() {
pop_past cw pop_past cw
if [[ "" == "$cw" ]]; then if [[ "" == "$cw" ]]; then
# Someone overwrote our variable. Recover it. # Someone overwrote our variable. Recover it.
dirhistory_past=(`pwd`) dirhistory_past=($PWD)
return return
fi fi
......
...@@ -14,12 +14,12 @@ jump() { ...@@ -14,12 +14,12 @@ jump() {
mark() { mark() {
if (( $# == 0 )); then if (( $# == 0 )); then
MARK=$(basename "$(pwd)") MARK=$(basename "$PWD")
else else
MARK="$1" MARK="$1"
fi fi
if read -q \?"Mark $(pwd) as ${MARK}? (y/n) "; then if read -q \?"Mark $PWD as ${MARK}? (y/n) "; then
mkdir -p "$MARKPATH"; ln -s "$(pwd)" "$MARKPATH/$MARK" mkdir -p "$MARKPATH"; ln -s "$PWD" "$MARKPATH/$MARK"
fi fi
} }
......
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
rack_root(){ rack_root(){
setopt chaselinks setopt chaselinks
local orgdir="$(pwd)" local orgdir="$PWD"
local basedir="$(pwd)" local basedir="$PWD"
while [[ $basedir != '/' ]]; do while [[ $basedir != '/' ]]; do
test -e "$basedir/config.ru" && break test -e "$basedir/config.ru" && break
builtin cd ".." 2>/dev/null builtin cd ".." 2>/dev/null
basedir="$(pwd)" basedir="$PWD"
done done
builtin cd "$orgdir" 2>/dev/null builtin cd "$orgdir" 2>/dev/null
...@@ -56,7 +56,7 @@ kapow(){ ...@@ -56,7 +56,7 @@ kapow(){
compctl -W ~/.pow -/ kapow compctl -W ~/.pow -/ kapow
powit(){ powit(){
local basedir="$(pwd)" local basedir="$PWD"
local vhost=$1 local vhost=$1
[ ! -n "$vhost" ] && vhost=$(rack_root_detect) [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
if [ ! -h ~/.pow/$vhost ] if [ ! -h ~/.pow/$vhost ]
......
...@@ -77,7 +77,7 @@ function svn_dirty() { ...@@ -77,7 +77,7 @@ function svn_dirty() {
function svn_dirty_choose_pwd () { function svn_dirty_choose_pwd () {
if in_svn; then if in_svn; then
root=`pwd` root=$PWD
if $(svn status $root 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'); then 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". # Grep exits with 0 when "One or more lines were selected", return "dirty".
echo $1 echo $1
......
...@@ -30,7 +30,7 @@ function retlog() { ...@@ -30,7 +30,7 @@ function retlog() {
} }
alias ping='ping -c 5' 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 path='echo -e ${PATH//:/\\n}'
alias mkdir='mkdir -pv' alias mkdir='mkdir -pv'
# get top process eating memory # get top process eating memory
......
...@@ -9,7 +9,7 @@ function resolveFile ...@@ -9,7 +9,7 @@ function resolveFile
if [ -f "$1" ]; then if [ -f "$1" ]; then
echo $(readlink -f "$1") echo $(readlink -f "$1")
elif [[ "${1#/}" == "$1" ]]; then elif [[ "${1#/}" == "$1" ]]; then
echo "$(pwd)/$1" echo "$PWD/$1"
else else
echo $1 echo $1
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment