shell-user/oh-my-bash
1
0
Fork 0
mirror of https://github.com/ohmybash/oh-my-bash.git synced 2024-05-11 05:55:37 +00:00
Code Issues Projects Releases Wiki Activity

oh-my-bash: Fix varname "OSH_{CUSOM => CUSTOM}"

Browse Source 
Co-authored-by: Rex Roof <github@rexroof.com>
This commit is contained in:
Koichi Murase
2022-01-05 23:13:48 +09:00
parent 556b43fdbb
commit 2c20b7bdb6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
oh-my-bash.sh
View File

@@ -35,11 +35,11 @@ _omb_module_require() {
local -a locations=()
case $type in
lib) locations=({"$OSH_CUSOM","$OSH"}/lib/"$name".{bash,sh}) ;;
plugin) locations=({"$OSH_CUSOM","$OSH"}/plugins/"$name"/"$name".plugin.{bash,sh}) ;;
alias) locations=({"$OSH_CUSOM","$OSH"}/aliases/"$name".aliases.{bash,sh}) ;;
completion) locations=({"$OSH_CUSOM","$OSH"}/completions/"$name".completion.{bash,sh}) ;;
theme) locations=({"$OSH_CUSOM"{,/themes},"$OSH"/themes}/"$name"/"$name".theme.{bash,sh}) ;;
lib) locations=({"$OSH_CUSTOM","$OSH"}/lib/"$name".{bash,sh}) ;;
plugin) locations=({"$OSH_CUSTOM","$OSH"}/plugins/"$name"/"$name".plugin.{bash,sh}) ;;
alias) locations=({"$OSH_CUSTOM","$OSH"}/aliases/"$name".aliases.{bash,sh}) ;;
completion) locations=({"$OSH_CUSTOM","$OSH"}/completions/"$name".completion.{bash,sh}) ;;
theme) locations=({"$OSH_CUSTOM"{,/themes},"$OSH"/themes}/"$name"/"$name".theme.{bash,sh}) ;;
*)
echo "oh-my-bash (module_require): unknown package type '$type'." >&2
status=2
@@ -78,7 +78,7 @@ _omb_module_require_theme() { _omb_module_require "${@/#/theme:}"; }
# TIP: Add files you don't want in git to .gitignore
_omb_module_require_lib utils
_omb_module_require_lib omb-deprecate
_omb_util_glob_expand _omb_init_files '{"$OSH","$OSH_CUSOM"}/lib/*.sh'
_omb_util_glob_expand _omb_init_files '{"$OSH","$OSH_CUSTOM"}/lib/*.sh'
_omb_init_files=("${_omb_init_files[@]##*/}")
_omb_init_files=("${_omb_init_files[@]%.sh}")
_omb_module_require_lib "${_omb_init_files[@]}"