X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=bash-selector.sh;h=7246d4507b334643f0d157f591f070600ead81b3;hb=247055c60e22d0347e5c46259163a9c7fdab5dee;hp=fbb5aa64041713c6e89e9bcd15cbbc2ee1fbf6db;hpb=af6347e4968f1b68bd2a5cdfaf47ef6ecb156ff3;p=selector.git

diff --git a/bash-selector.sh b/bash-selector.sh
index fbb5aa6..7246d45 100755
--- a/bash-selector.sh
+++ b/bash-selector.sh
@@ -47,39 +47,56 @@ function selector-history () {
 # Selector-based directory history
 ######################################################################
 
-# The file where we will keep track of the directories
+# The file where we will keep track of the directories and how many
+# lines to keep in there
 
 export SELECTOR_CD_HISTORY
 
 [[ "${SELECTOR_CD_HISTORY}" ]] || SELECTOR_CD_HISTORY=${HOME}/.selector-cd-history
 
+export SELECTOR_CD_HISTORY_SIZE
+
+[[ "${SELECTOR_CD_HISTORY_SIZE}" ]] || SELECTOR_CD_HISTORY_SIZE=1000
+
 # The function to use in place of the standard "cd"
 
 function selector-cd () {
+    local UMASK=$(umask)
+    umask 077
+
     if [[ -z "$1" ]]; then
         cd
     else
         cd "$@"
     fi
 
-    if [[ -f ${SELECTOR_CD_HISTORY} ]]; then
+    if [[ -f "${SELECTOR_CD_HISTORY}" ]]; then
         TMP=$(mktemp /tmp/selector-cd.XXXXXX)
-        tail -999 < ${SELECTOR_CD_HISTORY} > ${TMP}
-        cat ${TMP} > ${SELECTOR_CD_HISTORY}
-        rm -f ${TMP}
+        tail -$((SELECTOR_CD_HISTORY_SIZE-1)) < "${SELECTOR_CD_HISTORY}" > "${TMP}"
+        cat "${TMP}" > "${SELECTOR_CD_HISTORY}"
+        \rm -f "${TMP}"
     fi
 
-    echo $PWD | sed -e "s!^${HOME}!~!" >> ${SELECTOR_CD_HISTORY}
+    echo "${PWD}" | sed -e "s!^${HOME}!~!" >> "${SELECTOR_CD_HISTORY}"
+    umask ${UMASK}
 }
 
 function selector-cd-search () {
-    PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX)
-    selector -j -y -u -t "cd" -l 1000 -d -i -c 7,2,0,3 -o ${PATH_TEMP} -q ${SELECTOR_CD_HISTORY}
-    NEW_PATH="$(cat ${PATH_TEMP} | sed -e 's!~!'${HOME}'!')"
-    if [[ -s "${NEW_PATH}" ]]; then
-        selector-cd "$(cat ${PATH_TEMP} | sed -e 's!^~!'${HOME}'!')"
+    local UMASK=$(umask)
+    umask 077
+
+    if [[ -f "${SELECTOR_CD_HISTORY}" ]]; then
+        PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX)
+        selector -j -y -u -t "cd" -l "${SELECTOR_CD_HISTORY_SIZE}" -d -i -c 7,2,0,3 -o "${PATH_TEMP}" -q "${SELECTOR_CD_HISTORY}"
+        NEW_PATH="$(cat "${PATH_TEMP}" | sed -e 's!~!'${HOME}'!')"
+        if [[ -d "${NEW_PATH}" ]]; then
+            selector-cd "$(cat "${PATH_TEMP}" | sed -e 's!^~!'${HOME}'!')"
+        fi
+        \rm "${PATH_TEMP}"
+    else
+        echo "No cd history file '${SELECTOR_CD_HISTORY}'." >&2
     fi
-    \rm ${PATH_TEMP}
+    umask ${UMASK}
 }
 
 alias cd=selector-cd
@@ -88,8 +105,8 @@ alias cd=selector-cd
 # The key-bindings themselves
 ######################################################################
 
-    # M-t appends the selected history line and the end of the current
-    # one bind '"\C-[t":"\C-a\C-kselector-history\C-m\C-a\C-y\C-e"'
+# M-t appends the selected history line and the end of the current
+# one bind '"\C-[t":"\C-a\C-kselector-history\C-m\C-a\C-y\C-e"'
 
 if [[ "$1" ]]; then