Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

History in XDG_DATA_HOME, configurable via Environment variable #1421

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

History in XDG_DATA_HOME, configurable via Environment variable #1421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9feaa49
Respect HISTFILE_OSH/_OIL and move history file
eliminmax Sep 27, 2022
0b6903d
Update version from 0.12.6 to 0.12.6-hist
eliminmax Sep 29, 2022
1179136
Merge remote-tracking branch 'origin/master' into histfile_support
eliminmax Oct 25, 2022
f3444d2
Update oil-version
eliminmax Oct 25, 2022
46f04ab
Merge branch 'histfile_support' into release/0.12.9-hist
eliminmax Dec 5, 2022
f2b9698
Merge branch 'release/0.12.9-hist'
eliminmax Dec 5, 2022
6e36c00
Remove debug print
eliminmax Dec 5, 2022
eb3c429
Remove `-hist` from version identifier
eliminmax Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion core/shell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,15 @@ def Main(lang, arg_r, environ, login_shell, loader, line_input):
debug_f, line_input) # type: comp_ui._IDisplay
else:
display = comp_ui.MinimalDisplay(comp_ui_state, prompt_state, debug_f)
if 'HISTFILE_%s' % lang.upper() in environ:
history_filename = environ.get('HISTFILE_%s' % lang.upper())
elif 'XDG_DATA_HOME' in environ:
history_filename = os_path.join(
environ.get('XDG_DATA_HOME'), 'oil/history_%s' % lang)
else:
history_filename = os_path.join(
home_dir, '.local/share/oil/history_%s' % lang)

history_filename = os_path.join(home_dir, '.config/oil/history_%s' % lang)
comp_ui.InitReadline(line_input, history_filename, root_comp, display,
debug_f)
if mylib.PYTHON:
Expand Down
3 changes: 1 addition & 2 deletions oil-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
0.12.9

# The first line of this file is the Oil version, and the rest is ignored.
# It's used at build time for the release tarball, and at runtime for oil
# It's used at build time for the release tarball, and at runtime for oil
# --version / osh --version.