From 3fac127152e42a3149fa7174a0841de97f2fb82a Mon Sep 17 00:00:00 2001
From: MrTux <mrtux@ubuntu-vn.org>
Date: Tue, 14 Jan 2014 02:19:33 +0700
Subject: Correct wrong plugin file name

---
 plugins/systemadmin/systemadmin.plugin.zsh | 159 +++++++++++++++++++++++++++++
 plugins/systemadmin/systemadmin.zsh        | 159 -----------------------------
 2 files changed, 159 insertions(+), 159 deletions(-)
 create mode 100644 plugins/systemadmin/systemadmin.plugin.zsh
 delete mode 100644 plugins/systemadmin/systemadmin.zsh

(limited to 'plugins/systemadmin')

diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
new file mode 100644
index 000000000..f5e44c66f
--- /dev/null
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -0,0 +1,159 @@
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+# This is one for the system administrator, operation and maintenance.
+# Some of which come from http://justinlilly.com/dotfiles/zsh.html
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+# * Dongweiming <ciici123@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+function retval() {
+    if [[ -z $1 ]];then
+        echo '.'
+    else
+        echo $1
+    fi
+}
+
+function retlog() {
+    if [[ -z $1 ]];then
+        echo '/var/log/nginx/access.log'
+    else
+        echo $1
+    fi
+}
+
+alias ping='ping -c 5'
+alias clr='clear;echo "Currently logged in on $(tty), as $(whoami) in directory $(pwd)."'
+alias path='echo -e ${PATH//:/\\n}'
+alias mkdir='mkdir -pv'
+# get top process eating memory
+alias psmem='ps -e -orss=,args= | sort -b -k1,1n'
+alias psmem10='ps -e -orss=,args= | sort -b -k1,1n| head -10'
+# get top process eating cpu if not work try excute : export LC_ALL='C'
+alias pscpu='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1 -nr'
+alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1 -nr | head -10'
+# top10 of the history
+alias hist10='print -l ${(o)history%% *} | uniq -c | sort -nr | head -n 10'
+
+# directory LS
+dls () {
+    ls -l | grep "^d" | awk '{ print $9 }' | tr -d "/"
+}
+psgrep() {
+    ps aux | grep "$(retval $1)" | grep -v grep
+}
+# Kills any process that matches a regexp passed to it
+killit() {
+    ps aux | grep -v "grep" | grep "$@" | awk '{print $2}' | xargs sudo kill
+}
+
+# list contents of directories in a tree-like format
+if [ -z "\${which tree}" ]; then
+  tree () {
+      find $@ -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'
+  }
+fi
+
+# Sort connection state
+sortcons() {
+    netstat -nat |awk '{print $6}'|sort|uniq -c|sort -rn
+}
+
+# View all 80 Port Connections
+con80() {
+    netstat -nat|grep -i ":80"|wc -l
+}
+
+# On the connected IP sorted by the number of connections
+sortconip() {
+    netstat -ntu | awk '{print $5}' | cut -d: -f1 | sort | uniq -c | sort -n
+}
+
+# top20 of Find the number of requests on 80 port
+req20() {
+    netstat -anlp|grep 80|grep tcp|awk '{print $5}'|awk -F: '{print $1}'|sort|uniq -c|sort -nr|head -n20
+}
+
+# top20 of Using tcpdump port 80 access to view
+http20() {
+    sudo tcpdump -i eth0 -tnn dst port 80 -c 1000 | awk -F"." '{print $1"."$2"."$3"."$4}' | sort | uniq -c | sort -nr |head -20
+}
+
+# top20 of Find time_wait connection
+timewait20() {
+    netstat -n|grep TIME_WAIT|awk '{print $5}'|sort|uniq -c|sort -rn|head -n20
+}
+
+# top20 of Find SYN connection
+syn20() {
+    netstat -an | grep SYN | awk '{print $5}' | awk -F: '{print $1}' | sort | uniq -c | sort -nr|head -n20
+}
+
+# Printing process according to the port number
+port_pro() {
+    netstat -ntlp | grep "$(retval $1)" | awk '{print $7}' | cut -d/ -f1
+}
+
+# top10 of gain access to the ip address
+accessip10() {
+    awk '{counts[$(11)]+=1}; END {for(url in counts) print counts[url], url}' "$(retlog)"
+}
+
+# top20 of Most Visited file or page
+visitpage20() {
+    awk '{print $11}' "$(retlog)"|sort|uniq -c|sort -nr|head -20
+}
+
+# top100 of Page lists the most time-consuming (more than 60 seconds) as well as the corresponding page number of occurrences
+consume100() {
+    awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
+    # if django website or other webiste make by no suffix language
+    # awk '{print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
+}
+
+# Website traffic statistics (G)
+webtraffic() {
+    awk "{sum+=$10} END {print sum/1024/1024/1024}" "$(retlog)"
+}
+
+# Statistical connections 404
+c404() {
+    awk '($9 ~/404/)' "$(retlog)" | awk '{print $9,$7}' | sort
+}
+
+# Statistical http status.
+httpstatus() {
+    awk '{counts[$(9)]+=1}; END {for(code in counts) print code, counts[code]}' "$(retlog)"
+}
+
+# Delete 0 byte file
+d0() {
+    find "$(retval $1)" -type f -size 0 -exec rm -rf {} \;
+}
+
+# gather external ip address
+geteip() {
+    curl http://ifconfig.me
+}
+
+# determine local IP address
+getip() {
+    ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'
+}
+
+# Clear zombie processes
+clrz() {
+    ps -eal | awk '{ if ($2 == "Z") {print $4}}' | kill -9
+}
+
+# Second concurrent
+conssec() {
+    awk '{if($9~/200|30|404/)COUNT[$4]++}END{for( a in COUNT) print a,COUNT[a]}' "$(retlog)"|sort -k 2 -nr|head -n10
+}
diff --git a/plugins/systemadmin/systemadmin.zsh b/plugins/systemadmin/systemadmin.zsh
deleted file mode 100644
index f5e44c66f..000000000
--- a/plugins/systemadmin/systemadmin.zsh
+++ /dev/null
@@ -1,159 +0,0 @@
-# ------------------------------------------------------------------------------
-# Description
-# -----------
-#
-# This is one for the system administrator, operation and maintenance.
-# Some of which come from http://justinlilly.com/dotfiles/zsh.html
-#
-# ------------------------------------------------------------------------------
-# Authors
-# -------
-#
-# * Dongweiming <ciici123@gmail.com>
-#
-# ------------------------------------------------------------------------------
-
-function retval() {
-    if [[ -z $1 ]];then
-        echo '.'
-    else
-        echo $1
-    fi
-}
-
-function retlog() {
-    if [[ -z $1 ]];then
-        echo '/var/log/nginx/access.log'
-    else
-        echo $1
-    fi
-}
-
-alias ping='ping -c 5'
-alias clr='clear;echo "Currently logged in on $(tty), as $(whoami) in directory $(pwd)."'
-alias path='echo -e ${PATH//:/\\n}'
-alias mkdir='mkdir -pv'
-# get top process eating memory
-alias psmem='ps -e -orss=,args= | sort -b -k1,1n'
-alias psmem10='ps -e -orss=,args= | sort -b -k1,1n| head -10'
-# get top process eating cpu if not work try excute : export LC_ALL='C'
-alias pscpu='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1 -nr'
-alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1 -nr | head -10'
-# top10 of the history
-alias hist10='print -l ${(o)history%% *} | uniq -c | sort -nr | head -n 10'
-
-# directory LS
-dls () {
-    ls -l | grep "^d" | awk '{ print $9 }' | tr -d "/"
-}
-psgrep() {
-    ps aux | grep "$(retval $1)" | grep -v grep
-}
-# Kills any process that matches a regexp passed to it
-killit() {
-    ps aux | grep -v "grep" | grep "$@" | awk '{print $2}' | xargs sudo kill
-}
-
-# list contents of directories in a tree-like format
-if [ -z "\${which tree}" ]; then
-  tree () {
-      find $@ -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'
-  }
-fi
-
-# Sort connection state
-sortcons() {
-    netstat -nat |awk '{print $6}'|sort|uniq -c|sort -rn
-}
-
-# View all 80 Port Connections
-con80() {
-    netstat -nat|grep -i ":80"|wc -l
-}
-
-# On the connected IP sorted by the number of connections
-sortconip() {
-    netstat -ntu | awk '{print $5}' | cut -d: -f1 | sort | uniq -c | sort -n
-}
-
-# top20 of Find the number of requests on 80 port
-req20() {
-    netstat -anlp|grep 80|grep tcp|awk '{print $5}'|awk -F: '{print $1}'|sort|uniq -c|sort -nr|head -n20
-}
-
-# top20 of Using tcpdump port 80 access to view
-http20() {
-    sudo tcpdump -i eth0 -tnn dst port 80 -c 1000 | awk -F"." '{print $1"."$2"."$3"."$4}' | sort | uniq -c | sort -nr |head -20
-}
-
-# top20 of Find time_wait connection
-timewait20() {
-    netstat -n|grep TIME_WAIT|awk '{print $5}'|sort|uniq -c|sort -rn|head -n20
-}
-
-# top20 of Find SYN connection
-syn20() {
-    netstat -an | grep SYN | awk '{print $5}' | awk -F: '{print $1}' | sort | uniq -c | sort -nr|head -n20
-}
-
-# Printing process according to the port number
-port_pro() {
-    netstat -ntlp | grep "$(retval $1)" | awk '{print $7}' | cut -d/ -f1
-}
-
-# top10 of gain access to the ip address
-accessip10() {
-    awk '{counts[$(11)]+=1}; END {for(url in counts) print counts[url], url}' "$(retlog)"
-}
-
-# top20 of Most Visited file or page
-visitpage20() {
-    awk '{print $11}' "$(retlog)"|sort|uniq -c|sort -nr|head -20
-}
-
-# top100 of Page lists the most time-consuming (more than 60 seconds) as well as the corresponding page number of occurrences
-consume100() {
-    awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
-    # if django website or other webiste make by no suffix language
-    # awk '{print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
-}
-
-# Website traffic statistics (G)
-webtraffic() {
-    awk "{sum+=$10} END {print sum/1024/1024/1024}" "$(retlog)"
-}
-
-# Statistical connections 404
-c404() {
-    awk '($9 ~/404/)' "$(retlog)" | awk '{print $9,$7}' | sort
-}
-
-# Statistical http status.
-httpstatus() {
-    awk '{counts[$(9)]+=1}; END {for(code in counts) print code, counts[code]}' "$(retlog)"
-}
-
-# Delete 0 byte file
-d0() {
-    find "$(retval $1)" -type f -size 0 -exec rm -rf {} \;
-}
-
-# gather external ip address
-geteip() {
-    curl http://ifconfig.me
-}
-
-# determine local IP address
-getip() {
-    ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'
-}
-
-# Clear zombie processes
-clrz() {
-    ps -eal | awk '{ if ($2 == "Z") {print $4}}' | kill -9
-}
-
-# Second concurrent
-conssec() {
-    awk '{if($9~/200|30|404/)COUNT[$4]++}END{for( a in COUNT) print a,COUNT[a]}' "$(retlog)"|sort -k 2 -nr|head -n10
-}
-- 
cgit v1.2.3-70-g09d2


From 74177c5320b2a1b2f8c4c695c05984b57fd7c6ea Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 9 Oct 2014 13:44:54 +0200
Subject: Change all whoami calls for $USER variable

This avoid spawning additional processes, as the $USER variable will
**always** contain the current logged-in user.
---
 lib/completion.zsh                         | 4 ++--
 plugins/systemadmin/systemadmin.plugin.zsh | 2 +-
 themes/adben.zsh-theme                     | 5 ++---
 themes/agnoster.zsh-theme                  | 6 ++----
 themes/flazz.zsh-theme                     | 2 +-
 themes/obraun.zsh-theme                    | 2 +-
 themes/re5et.zsh-theme                     | 2 +-
 themes/sunrise.zsh-theme                   | 2 +-
 themes/ys.zsh-theme                        | 2 +-
 9 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'plugins/systemadmin')

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 83b6efb66..3a19a4eba 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -27,9 +27,9 @@ zstyle ':completion:*:*:*:*:*' menu select
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
 if [ "$OSTYPE[0,7]" = "solaris" ]
 then
-  zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm"
+  zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm"
 else
-  zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
+  zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w"
 fi
 
 # disable named-directories autocompletion
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index f5e44c66f..e0b1773ad 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 $(whoami) 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/themes/adben.zsh-theme b/themes/adben.zsh-theme
index aa3093f64..6869c8a20 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -89,9 +89,8 @@ function precmd {
 
 # Context: user@directory or just directory
 prompt_context () {
-    local user=`whoami`
-    if [[ "$user" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-        echo -n "${PR_RESET}${PR_RED}$user@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
+    if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+        echo -n "${PR_RESET}${PR_RED}$USER@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
     else
         echo -n "${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
     fi
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 2b33c48bc..7a62bd860 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -60,10 +60,8 @@ prompt_end() {
 
 # Context: user@hostname (who am I and where am I)
 prompt_context() {
-  local user=`whoami`
-
-  if [[ "$user" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-    prompt_segment black default "%(!.%{%F{yellow}%}.)$user@%m"
+  if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+    prompt_segment black default "%(!.%{%F{yellow}%}.)$USER@%m"
   fi
 }
 
diff --git a/themes/flazz.zsh-theme b/themes/flazz.zsh-theme
index 280794f2b..c0a7fb5d0 100644
--- a/themes/flazz.zsh-theme
+++ b/themes/flazz.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]
+if [ "$USER" = "root" ]
 then CARETCOLOR="red"
 else CARETCOLOR="blue"
 fi
diff --git a/themes/obraun.zsh-theme b/themes/obraun.zsh-theme
index 08d137665..7af44056f 100644
--- a/themes/obraun.zsh-theme
+++ b/themes/obraun.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
+if [ "$USER" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
 
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
diff --git a/themes/re5et.zsh-theme b/themes/re5et.zsh-theme
index 5bded76a3..95af1e2ee 100644
--- a/themes/re5et.zsh-theme
+++ b/themes/re5et.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="magenta"; fi
+if [ "$USER" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="magenta"; fi
 
 local return_code="%(?..%{$fg_bold[red]%}:( %?%{$reset_color%})"
 
diff --git a/themes/sunrise.zsh-theme b/themes/sunrise.zsh-theme
index 4bea20a1b..28befd01b 100644
--- a/themes/sunrise.zsh-theme
+++ b/themes/sunrise.zsh-theme
@@ -10,7 +10,7 @@ Y=$fg_no_bold[yellow]
 B=$fg_no_bold[blue]
 RESET=$reset_color
 
-if [ "$(whoami)" = "root" ]; then
+if [ "$USER" = "root" ]; then
     PROMPTCOLOR="%{$R%}" PREFIX="-!-";
 else
     PROMPTCOLOR="" PREFIX="---";
diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index a44f295f4..65448964d 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -33,7 +33,7 @@ ${git_info} \
 %{$fg[white]%}[%*]
 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
 
-if [[ "$(whoami)" == "root" ]]; then
+if [[ "$USER" == "root" ]]; then
 PROMPT="
 %{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \
 %{$bg[yellow]%}%{$fg[cyan]%}%n%{$reset_color%} \
-- 
cgit v1.2.3-70-g09d2


From 4310a15de5d0587ef135f9e12857620c4788dec2 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Thu, 9 Oct 2014 13:55:50 +0200
Subject: Change all pwd calls for $PWD variable

This avoids spawning additional processes as $PWD **always** contains
the current working directory.
---
 plugins/dirhistory/dirhistory.plugin.zsh           | 6 +++---
 plugins/jump/jump.plugin.zsh                       | 6 +++---
 plugins/pow/pow.plugin.zsh                         | 8 ++++----
 plugins/svn/svn.plugin.zsh                         | 2 +-
 plugins/systemadmin/systemadmin.plugin.zsh         | 2 +-
 plugins/vim-interaction/vim-interaction.plugin.zsh | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'plugins/systemadmin')

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
-- 
cgit v1.2.3-70-g09d2