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

Fix "modify_autojump_sh" wrong behavior

Browse Source 
The "modify_autojump_sh" function in "install.py" patches the "autojump.sh" in the wrong way in case the user has chosen a different dest_dir.
In particular, if we consider a dest_dir set to "/usr/local/Cellar/autojump/22.2.2", it would write something like:
source /usr/local/Cellar/autojump/22.2.2/etc/profile.d/autojump.${shell}
which does not exist, since all the autojump.${shell} files are placed under the share_dir. The correct path would be:
/usr/local/Cellar/autojump/22.2.2/share/autojump/autojump.${shell}
This commit is contained in:
Alessio Bogon 2014-12-18 03:13:36 +01:00
parent c5f0473837
commit c29a369289
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install.py
View File

@ -29,13 +29,13 @@ def mkdir(path, dryrun=False):
os.makedirs(path) os.makedirs(path)
def modify_autojump_sh(etc_dir, dryrun=False): def modify_autojump_sh(etc_dir, share_dir, dryrun=False):
"""Append custom installation path to autojump.sh""" """Append custom installation path to autojump.sh"""
custom_install = "\ custom_install = "\
\n# check custom install \ \n# check custom install \
\nif [ -s %s/autojump.${shell} ]; then \ \nif [ -s %s/autojump.${shell} ]; then \
\n\tsource %s/autojump.${shell} \ \n\tsource %s/autojump.${shell} \
\nfi\n" % (etc_dir, etc_dir) \nfi\n" % (share_dir, share_dir)
with open(os.path.join(etc_dir, 'autojump.sh'), 'a') as f: with open(os.path.join(etc_dir, 'autojump.sh'), 'a') as f:
f.write(custom_install) f.write(custom_install)
@ -207,7 +207,7 @@ def main(args):
cp('./bin/_j', zshshare_dir, args.dryrun) cp('./bin/_j', zshshare_dir, args.dryrun)
if args.custom_install: if args.custom_install:
modify_autojump_sh(etc_dir, args.dryrun) modify_autojump_sh(etc_dir, share_dir, args.dryrun)
show_post_installation_message(etc_dir, share_dir, bin_dir) show_post_installation_message(etc_dir, share_dir, bin_dir)