X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=bash-selector.sh;h=ac094c82ff23d84e071f864d1bcc1dd9acd6c275;hb=496ff801c25b7be6c45b97e141f4890809f4fd08;hp=cbf8ed542817204685b7e8c4596ab1a0eff3006e;hpb=40783cf11bb49618d80fa3f588632a1c61c0ce2d;p=selector.git

diff --git a/bash-selector.sh b/bash-selector.sh
index cbf8ed5..ac094c8 100755
--- a/bash-selector.sh
+++ b/bash-selector.sh
@@ -3,7 +3,7 @@
 #  selector is a simple command line utility for selection of strings
 #  with a dynamic pattern-matching.
 #
-#  Copyright (c) 2009, 2010, 2011, 2012 Francois Fleuret
+#  Copyright (c) 2011, 2012 Francois Fleuret
 #  Written by Francois Fleuret <francois@fleuret.org>
 #
 #  This file is part of selector.
@@ -47,39 +47,52 @@ 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 () {
+    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}"
 }
 
 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}'!')"
+    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}
 }
 
 alias cd=selector-cd