XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable keep-padding option in shfmt 

Has some serious bugs and not really needed
Also fixed all files that need to be changed after this
pull/1810/head
Noah Gorny 2021-01-21 22:08:43 +02:00
parent 79df5ffc3c
commit d2ab59fef8
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.editorconfig
View File

@ -23,7 +23,7 @@ shell_variant = bash
binary_next_line = true # like -bn binary_next_line = true # like -bn
switch_case_indent = true # like -ci switch_case_indent = true # like -ci
space_redirects = true # like -sr space_redirects = true # like -sr
keep_padding = true # like -kp keep_padding = false # like -kp
end_of_line = lf end_of_line = lf
charset = utf-8 charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true

26
aliases/available/dnf.aliases.bash
View File

@ -2,17 +2,17 @@
cite 'about-alias' cite 'about-alias'
about-alias 'dnf aliases for fedora 22+ distros' about-alias 'dnf aliases for fedora 22+ distros'
alias dnfl="dnf list" # List packages alias dnfl="dnf list" # List packages
alias dnfli="dnf list installed" # List installed packages alias dnfli="dnf list installed" # List installed packages
alias dnfgl="dnf grouplist" # List package groups alias dnfgl="dnf grouplist" # List package groups
alias dnfmc="dnf makecache" # Generate metadata cache alias dnfmc="dnf makecache" # Generate metadata cache
alias dnfp="dnf info" # Show package information alias dnfp="dnf info" # Show package information
alias dnfs="dnf search" # Search package alias dnfs="dnf search" # Search package
alias dnfu="sudo dnf upgrade" # Upgrade package alias dnfu="sudo dnf upgrade" # Upgrade package
alias dnfi="sudo dnf install" # Install package alias dnfi="sudo dnf install" # Install package
alias dnfri='sudo dnf reinstall' # Reinstall package alias dnfri='sudo dnf reinstall' # Reinstall package
alias dnfgi="sudo dnf groupinstall" # Install package group alias dnfgi="sudo dnf groupinstall" # Install package group
alias dnfr="sudo dnf remove" # Remove package alias dnfr="sudo dnf remove" # Remove package
alias dnfgr="sudo dnf groupremove" # Remove package group alias dnfgr="sudo dnf groupremove" # Remove package group
alias dnfc="sudo dnf clean all" # Clean cache alias dnfc="sudo dnf clean all" # Clean cache

2
aliases/available/git.aliases.bash
View File

@ -155,7 +155,7 @@ alias gst='git stash'
alias gstb='git stash branch' alias gstb='git stash branch'
alias gstd='git stash drop' alias gstd='git stash drop'
alias gstl='git stash list' alias gstl='git stash list'
alias gstp='git stash pop' # kept due to long-standing usage alias gstp='git stash pop' # kept due to long-standing usage
alias gstpo='git stash pop' # recommended for it's symmetry with gstpu (push) alias gstpo='git stash pop' # recommended for it's symmetry with gstpu (push)
## 'stash push' introduced in git v2.13.2 ## 'stash push' introduced in git v2.13.2

10
themes/base.theme.bash
View File

@ -87,8 +87,8 @@ RBFU_THEME_PROMPT_SUFFIX='|'
GIT_EXE=$(which git 2> /dev/null || true) GIT_EXE=$(which git 2> /dev/null || true)
P4_EXE=$(which p4 2> /dev/null || true) P4_EXE=$(which p4 2> /dev/null || true)
HG_EXE=$(which hg 2> /dev/null || true) HG_EXE=$(which hg 2> /dev/null || true)
SVN_EXE=$(which svn 2> /dev/null || true) SVN_EXE=$(which svn 2> /dev/null || true)
# Check for broken SVN exe that is caused by some versions of Xcode. # Check for broken SVN exe that is caused by some versions of Xcode.
# See https://github.com/Bash-it/bash-it/issues/1612 for more details. # See https://github.com/Bash-it/bash-it/issues/1612 for more details.
@ -207,8 +207,10 @@ function git_prompt_minimal_info {
} }
function git_prompt_vars { function git_prompt_vars {
if ${SCM_GIT_USE_GITSTATUS} && _command_exists gitstatus_query && gitstatus_query && [[ "${VCS_STATUS_RESULT}" == "ok-sync" ]]; then # use faster gitstatus if ${SCM_GIT_USE_GITSTATUS} && _command_exists gitstatus_query && gitstatus_query && [[ "${VCS_STATUS_RESULT}" == "ok-sync" ]]; then
SCM_GIT_GITSTATUS_RAN=true # use this in githelpers and below to choose gitstatus output # we can use faster gitstatus
# use this variable in githelpers and below to choose gitstatus output
SCM_GIT_GITSTATUS_RAN=true
else else
SCM_GIT_GITSTATUS_RAN=false SCM_GIT_GITSTATUS_RAN=false
fi fi