Archives/wting_autojump
1
0
Fork 0
mirror of https://github.com/wting/autojump synced 2024-10-27 20:34:07 +00:00
Code Issues Releases Wiki Activity

Obey AUTOJUMP_KEEP_SYMLINKS when testing current directory against paths.

Browse Source 
This is to make sure we don't jump into our current directory when the symlinks
option is enabled.
This commit is contained in:
William Ting 2012-06-04 08:06:25 -10:00
parent 05026ff54e
commit 3a7f211fb6
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/autojump
View File

@ -54,6 +54,10 @@ ALWAYS_IGNORE_CASE = False
if 'AUTOJUMP_IGNORE_CASE' in os.environ and os.environ.get('AUTOJUMP_IGNORE_CASE') == '1': if 'AUTOJUMP_IGNORE_CASE' in os.environ and os.environ.get('AUTOJUMP_IGNORE_CASE') == '1':
ALWAYS_IGNORE_CASE = True ALWAYS_IGNORE_CASE = True
KEEP_SYMLINKS = False
if 'AUTOJUMP_KEEP_SYMLINKS' in os.environ and os.environ.get('AUTOJUMP_KEEP_SYMLINKS') == '1':
KEEP_SYMLINKS = True
if CONFIG_DIR == os.path.expanduser('~'): if CONFIG_DIR == os.path.expanduser('~'):
DB_FILE = CONFIG_DIR + '/.autojump.txt' DB_FILE = CONFIG_DIR + '/.autojump.txt'
else: else:
@ -74,7 +78,7 @@ class Database:
def add(self, path, increment = 10): def add(self, path, increment = 10):
""" """
Increment existing paths or initialize new ones to 0. Increment existing paths or initialize new ones to 10.
""" """
if path not in self.data: if path not in self.data:
self.data[path] = increment self.data[path] = increment
@ -359,6 +363,9 @@ def find_matches(db, patterns, max_matches=1, ignore_case=False, fuzzy=False):
Find max_matches paths that match the pattern, and add them to the result_list. Find max_matches paths that match the pattern, and add them to the result_list.
""" """
try: try:
if KEEP_SYMLINKS:
current_dir = decode(os.curdir)
else:
current_dir = decode(os.path.realpath(os.curdir)) current_dir = decode(os.path.realpath(os.curdir))
except OSError: except OSError:
current_dir = None current_dir = None