From 79aa545cd77a1e4f1bba90e6a158f5531aa83c01 Mon Sep 17 00:00:00 2001
From: Dan Bolsun <dan.bolsun@gmail.com>
Date: Wed, 2 Jul 2014 11:02:46 +0300
Subject: [PATCH] Allow usage of z while in 'sudo -s' mode

---
 z.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/z.sh b/z.sh
index 9517f05..e3f6776 100644
--- a/z.sh
+++ b/z.sh
@@ -13,6 +13,7 @@
 #         set $_Z_NO_RESOLVE_SYMLINKS to prevent symlink resolution.
 #         set $_Z_NO_PROMPT_COMMAND if you're handling PROMPT_COMMAND yourself.
 #         set $_Z_EXCLUDE_DIRS to an array of directories to exclude.
+#         set $_Z_OWNER to your username if you want use z while sudo with $HOME kept
 #
 # USE:
 #     * z foo     # cd to most frecent dir matching foo
@@ -30,8 +31,8 @@ _z() {
 
     local datafile="${_Z_DATA:-$HOME/.z}"
 
-    # bail if we don't own ~/.z (we're another user but our ENV is still set)
-    [ -f "$datafile" -a ! -O "$datafile" ] && return
+    # bail if we don't own ~/.z and $_Z_OWNER not set
+    [ -z "$_Z_OWNER" -a -f "$datafile" -a ! -O "$datafile" ] && return
 
     # add entries
     if [ "$1" = "--add" ]; then
@@ -78,6 +79,7 @@ _z() {
         if [ $? -ne 0 -a -f "$datafile" ]; then
             env rm -f "$tempfile"
         else
+	    [ -n "$_Z_OWNER" ] && chown $_Z_OWNER:$(id -ng $_Z_OWNER) "$tempfile"
             env mv -f "$tempfile" "$datafile" || env rm -f "$tempfile"
         fi