Skip to content

Cleanup Ble.sh plugin clashes #2310

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

Merged
merged 3 commits into from
May 8, 2025
Merged

Cleanup Ble.sh plugin clashes #2310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa133ed
readonly HIST* variables is a bit extreme and clashes with ble.sh and…
May 7, 2025
0c17476
only the correct FZF integration loads, sepending on whether the bles…
May 7, 2025
14ce429
important syntax correction from the owenr of ble.sh
May 7, 2025
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
4 changes: 4 additions & 0 deletions plugins/available/blesh.plugin.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ _bash_it_ble_path=${XDG_DATA_HOME:-$HOME/.local/share}/blesh/ble.sh
if [[ -f $_bash_it_ble_path ]]; then
# shellcheck disable=1090
source "$_bash_it_ble_path" --attach=prompt
if _bash-it-component-item-is-enabled plugin fzf; then
ble-import -d integration/fzf-key-bindings
ble-import -d integration/fzf-completion
fi
else
_log_error "Could not find ble.sh in $_bash_it_ble_path"
_log_error "Please install using the following command:"
Expand Down
16 changes: 9 additions & 7 deletions plugins/available/fzf.plugin.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
cite about-plugin
about-plugin 'load fzf, if you are using it'

if [ -r ~/.fzf.bash ]; then
# shellcheck disable=SC1090
source ~/.fzf.bash
elif [ -r "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ]; then
# shellcheck disable=SC1091
source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash
fi
if ! _bash-it-component-item-is-enabled plugin blesh; then
if [ -r ~/.fzf.bash ]; then
# shellcheck disable=SC1090
source ~/.fzf.bash
elif [ -r "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash ]; then
# shellcheck disable=SC1091
source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.bash
fi
fi # only sources the keybindings and integration if blesh is not integrated already

# No need to continue if the command is not present
_command_exists fzf || return
Expand Down
6 changes: 3 additions & 3 deletions plugins/available/history-eternal.plugin.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ fi
# truncating the history file early.

# "Numeric values less than zero result in every command being saved on the history list (there is no limit)"
readonly HISTSIZE=-1 2> /dev/null || true
HISTSIZE=-1 2> /dev/null || true

# "Non-numeric values and numeric values less than zero inhibit truncation"
readonly HISTFILESIZE='unlimited' 2> /dev/null || true
HISTFILESIZE='unlimited' 2> /dev/null || true

# Use a custom history file location so history is not truncated
# if the environment ever loses this "eternal" configuration.
HISTDIR="${XDG_STATE_HOME:-${HOME?}/.local/state}/bash"
[[ -d ${HISTDIR?} ]] || mkdir -p "${HISTDIR?}"
readonly HISTFILE="${HISTDIR?}/history" 2> /dev/null || true
HISTFILE="${HISTDIR?}/history" 2> /dev/null || true
Loading