From 860f9b83e62acb1a2da5f67fc81803287824df14 Mon Sep 17 00:00:00 2001 From: Wabri Date: Mon, 13 Apr 2020 12:48:29 +0200 Subject: [PATCH 1/5] Add (alias): create bashit to separate from general Instead of put all together in one alias source, it's better to create two different files and separate different features. --- aliases/available/bashit.aliases.bash | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 aliases/available/bashit.aliases.bash diff --git a/aliases/available/bashit.aliases.bash b/aliases/available/bashit.aliases.bash new file mode 100644 index 00000000..b11074be --- /dev/null +++ b/aliases/available/bashit.aliases.bash @@ -0,0 +1,24 @@ +cite about-alias +about-alias 'bashit aliases' + +# Common misspellings of bash-it +alias shit='bash-it' +alias batshit='bash-it' +alias bashit='bash-it' +alias batbsh='bash-it' +alias babsh='bash-it' +alias bash_it='bash-it' +alias bash_ti='bash-it' + +# Additional bash-it aliases for help/show +alias bshsa='bash-it show aliases' +alias bshsc='bash-it show completions' +alias bshsp='bash-it show plugins' +alias bshha='bash-it help aliases' +alias bshhc='bash-it help completions' +alias bshhp='bash-it help plugins' +alias bshsch="bash-it search" +alias bshenp="bash-it enable plugin" +alias bshena="bash-it enable alias" +alias bshenc="bash-it enable completion" + From 74f053db9d0d9dfa307290dcd3b812e1f2793c75 Mon Sep 17 00:00:00 2001 From: Wabri Date: Mon, 13 Apr 2020 12:51:20 +0200 Subject: [PATCH 2/5] Remove (alias): bash_it alias is no more required in general The bash_it alias are exported to the relative source, so is no more required in the general alias. --- aliases/available/general.aliases.bash | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash index 542b76cd..1b35a1ab 100644 --- a/aliases/available/general.aliases.bash +++ b/aliases/available/general.aliases.bash @@ -75,27 +75,6 @@ fi alias md='mkdir -p' alias rd='rmdir' -# Common misspellings of bash-it -alias shit='bash-it' -alias batshit='bash-it' -alias bashit='bash-it' -alias batbsh='bash-it' -alias babsh='bash-it' -alias bash_it='bash-it' -alias bash_ti='bash-it' - -# Additional bash-it aliases for help/show -alias bshsa='bash-it show aliases' -alias bshsc='bash-it show completions' -alias bshsp='bash-it show plugins' -alias bshha='bash-it help aliases' -alias bshhc='bash-it help completions' -alias bshhp='bash-it help plugins' -alias bshsch="bash-it search" -alias bshenp="bash-it enable plugin" -alias bshena="bash-it enable alias" -alias bshenc="bash-it enable completion" - # Shorten extract alias xt="extract" From 9ccee2878cf0c3633318dddd95ca0bc5894a956a Mon Sep 17 00:00:00 2001 From: Wabri Date: Wed, 15 Apr 2020 09:18:13 +0200 Subject: [PATCH 3/5] Fix (aliases): source bash-it alias in general This can let separate the bash-it alias from the system general one --- aliases/available/{bashit.aliases.bash => bash_it.aliases.bash} | 2 +- aliases/available/general.aliases.bash | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) rename aliases/available/{bashit.aliases.bash => bash_it.aliases.bash} (95%) diff --git a/aliases/available/bashit.aliases.bash b/aliases/available/bash_it.aliases.bash similarity index 95% rename from aliases/available/bashit.aliases.bash rename to aliases/available/bash_it.aliases.bash index b11074be..e26abd5a 100644 --- a/aliases/available/bashit.aliases.bash +++ b/aliases/available/bash_it.aliases.bash @@ -1,5 +1,5 @@ cite about-alias -about-alias 'bashit aliases' +about-alias 'Bash-it aliases' # Common misspellings of bash-it alias shit='bash-it' diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash index 1b35a1ab..2ab1c77a 100644 --- a/aliases/available/general.aliases.bash +++ b/aliases/available/general.aliases.bash @@ -92,3 +92,5 @@ catt() { fi done } + +source "$BASH_IT/aliases/available/bash-it.aliases.bash" From 4b2a0513f2dd4e14b23f8e9c082ced44637681a4 Mon Sep 17 00:00:00 2001 From: Wabri Date: Thu, 16 Apr 2020 12:30:52 +0200 Subject: [PATCH 4/5] Update (alias): change the about-alias description The bash-it alias description is now more clear --- .../available/{bash_it.aliases.bash => bash-it.aliases.bash} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename aliases/available/{bash_it.aliases.bash => bash-it.aliases.bash} (85%) diff --git a/aliases/available/bash_it.aliases.bash b/aliases/available/bash-it.aliases.bash similarity index 85% rename from aliases/available/bash_it.aliases.bash rename to aliases/available/bash-it.aliases.bash index e26abd5a..2461e830 100644 --- a/aliases/available/bash_it.aliases.bash +++ b/aliases/available/bash-it.aliases.bash @@ -1,5 +1,5 @@ cite about-alias -about-alias 'Bash-it aliases' +about-alias 'Aliases for the bash-it command (those aliases are also included with general aliases)' # Common misspellings of bash-it alias shit='bash-it' From 0b9c37f5d1e5c4b78981d9e4db63fe55bfcaf338 Mon Sep 17 00:00:00 2001 From: Wabri Date: Thu, 16 Apr 2020 12:32:52 +0200 Subject: [PATCH 5/5] Add (alias): create a comment above the source of bash-it To be more clear it was necessary to add a comment above source bash-it to explain what is the pourpose of doing that. --- aliases/available/general.aliases.bash | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash index 2ab1c77a..d628e71d 100644 --- a/aliases/available/general.aliases.bash +++ b/aliases/available/general.aliases.bash @@ -93,4 +93,8 @@ catt() { done } +# The bash-it aliases was move to bash-it.aliases.bash file. The intent of this +# is to maintain the script readable and less bloated. If you don't need to use +# those aliases, but you want the bash-it shortcuts, you can disable this +# script and enable the bash-it. source "$BASH_IT/aliases/available/bash-it.aliases.bash"