Skip to content

Commit ea46e91

Browse files
committed
Fix define-options.sh to respect existing environment variables
# define-options.sh # - - -
1 parent 9078b4e commit ea46e91

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

define-options.sh

+7-14
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,13 @@
77
[[ -n $BASH_TOYS_LOADED_DEFAULT_OPTIONS ]] && return
88

99
dir="$(cd -- "$(dirname -- "${BASH_SOURCE:-$0}")" && pwd || exit 1)"
10-
source "$dir/sources/define-alt-export.sh"
1110

12-
# TODO: Temporary overwrite variables. Shoud be fixed by using define-alt-export
13-
unset BASH_TOYS_INTERACTIVE_FILTER || true
14-
unset BASH_TOYS_DUSTBOX_DIR || true
15-
unset BASH_TOYS_MUSIC_PLAYER || true
16-
unset BASH_TOYS_POMODORO_NOTIFICATION_MUSIC || true
17-
unset BASH_TOYS_POMODORO_NOTIFICATION_DURATION || true
18-
unset BASH_TOYS_BATCAT_OPTIONS || true
19-
export BASH_TOYS_INTERACTIVE_FILTER=peco
20-
export BASH_TOYS_DUSTBOX_DIR="$HOME/.backup/dustbox"
21-
export BASH_TOYS_MUSIC_PLAYER=vlc
22-
export BASH_TOYS_POMODORO_NOTIFICATION_MUSIC="$dir/assets/notify.mp3"
23-
export BASH_TOYS_POMODORO_NOTIFICATION_DURATION=5
24-
export BASH_TOYS_BATCAT_OPTIONS=--number
11+
# Set default values only if variables are not already set
12+
[[ -z $BASH_TOYS_INTERACTIVE_FILTER ]] && export BASH_TOYS_INTERACTIVE_FILTER=peco
13+
[[ -z $BASH_TOYS_DUSTBOX_DIR ]] && export BASH_TOYS_DUSTBOX_DIR="$HOME/.backup/dustbox"
14+
[[ -z $BASH_TOYS_MUSIC_PLAYER ]] && export BASH_TOYS_MUSIC_PLAYER=vlc
15+
[[ -z $BASH_TOYS_POMODORO_NOTIFICATION_MUSIC ]] && export BASH_TOYS_POMODORO_NOTIFICATION_MUSIC="$dir/assets/notify.mp3"
16+
[[ -z $BASH_TOYS_POMODORO_NOTIFICATION_DURATION ]] && export BASH_TOYS_POMODORO_NOTIFICATION_DURATION=5
17+
[[ -z $BASH_TOYS_BATCAT_OPTIONS ]] && export BASH_TOYS_BATCAT_OPTIONS=--number
2518

2619
export BASH_TOYS_LOADED_DEFAULT_OPTIONS=true

0 commit comments

Comments
 (0)