Merge pull request #1687 from NoahGorny/enforce-pre-commit-only-newlines

Enforce pre-commit newline fixes

.editorconfig

@@ -5,6 +5,7 @@ indent_style = space
 indent_size = 2
 end_of_line = lf
 charset = utf-8
+
 trim_trailing_whitespace = true
 insert_final_newline = true
 
@@ -13,3 +14,17 @@ trim_trailing_whitespace = false
 
 [.git*]
 indent_style = tab
+
+[*.*sh]
+indent_style = tab
+indent_size = 4
+
+shell_variant      = bash
+binary_next_line   = true  # like -bn
+switch_case_indent = true  # like -ci
+space_redirects    = true  # like -sr
+keep_padding       = true  # like -kp
+end_of_line        = lf
+charset            = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
       - id: mixed-line-ending
       - id: check-added-large-files
   - repo: https://github.com/jumanjihouse/pre-commit-hooks
-    rev: 1.11.0
+    rev: 2.1.4
     hooks:
       - id: git-check  # Configure in .gitattributes
       - id: shellcheck

.travis.yml

@@ -24,7 +24,7 @@ jobs:
   include:
   - language: go
     go: "1.14"
-    name: Ubuntu 18.04
+    name: pre-commit lint
     dist: bionic
     sudo: required
     before_script:

aliases/available/fuck.aliases.bash

@@ -8,4 +8,3 @@ fi
 alias please=fuck
 alias plz=please
 alias fucking=sudo
-

aliases/available/node.aliases.bash

@@ -6,4 +6,3 @@ alias node-dev='export NODE_ENV=development'
 
 # alias to setup nodejs production environment
 alias node-prod='export NODE_ENV=production'
-

aliases/available/puppet.aliases.bash

@@ -7,4 +7,3 @@ alias puplint="puppet-lint *.pp"
 alias pupagt="puppet agent -t"
 alias pupagtd="puppet agent -t --debug"
 alias pupapp="puppet apply"
-

aliases/available/terraform.aliases.bash

@@ -8,4 +8,3 @@ alias tfv='terraform validate'
 alias tfp='terraform plan'
 alias tfa='terraform apply'
 alias tfd='terraform destory'
-

aliases/available/terragrunt.aliases.bash

@@ -13,4 +13,3 @@ alias tgva='terragrunt validate-all'
 alias tgpa='terragrunt plan-all'
 alias tgaa='terragrunt apply-all'
 alias tgda='terragrunt destroy-all'
-

completion/available/django.completion.bash

@@ -69,4 +69,3 @@ else
 fi
 
 complete -F _python_django_completion -o default $pythons
-

completion/available/homesick.completion.bash

@@ -57,4 +57,3 @@ _homesick_complete()
 }
 
 complete -o bashdefault -o default -F _homesick_complete homesick
-

completion/available/invoke.completion.bash

@@ -28,4 +28,3 @@ _complete_invoke() {
 # * -o default: when function generates no results, use filenames.
 # * positional args: program names to complete for.
 complete -F _complete_invoke -o default invoke inv
-

completion/available/kind.completion.bash

@@ -3,4 +3,3 @@
 if _command_exists kind; then
   eval "$(kind completion bash)"
 fi
-

completion/available/laravel.completion.bash

@@ -13,4 +13,3 @@ if command -v laravel > /dev/null; then
 
     complete -F __laravel_completion laravel
 fi
-

completion/available/ng.completion.bash

@@ -1,4 +1,3 @@
-
 if _command_exists ng; then
   # No longer supported, please see https://github.com/angular/angular-cli/issues/11043
   # Fix courtesy of https://stackoverflow.com/questions/50194674/ng-completion-no-longer-exists

completion/available/packer.completion.bash

@@ -161,4 +161,3 @@ _packer_completion ()
 }
 
 complete -o nospace -F _packer_completion packer
-

completion/available/pip3.completion.bash

@@ -8,4 +8,3 @@
 if command -v pip3 >/dev/null; then
   eval "$(pip3 completion --bash)"
 fi
-

completion/available/projects.completion.bash

@@ -44,4 +44,3 @@ _pj() {
 
 complete -F _pj -o nospace pj
 complete -F _pj -o nospace pjo
-

completion/available/salt.completion.bash

@@ -326,4 +326,3 @@ _saltcp(){
 }
 
 complete -F _saltcp salt-cp
-

completion/available/test_kitchen.completion.bash

@@ -28,4 +28,3 @@ __kitchen_options () {
   esac
 }
 complete -F __kitchen_options kitchen
-

completion/available/tmux.completion.bash

@@ -185,4 +185,3 @@ _tmux() {
 complete -F _tmux tmux
 
 # END tmux completion
-

completion/available/wpscan.completion.bash

@@ -13,4 +13,3 @@ if command -v wpscan > /dev/null; then
 
     complete -F __wpscan_completion wpscan
 fi
-

plugins/available/explain.plugin.bash

@@ -21,4 +21,3 @@ explain () {
     echo "explain 'cmd -o | ...'   one quoted command to explain it."
   fi
 }
-

plugins/available/git.plugin.bash

@@ -273,5 +273,3 @@ function gitignore-reload() {
     echo >&2 "Files readded. Commit your new changes now."
   fi
 }
-
-

plugins/available/gradle.plugin.bash

@@ -19,4 +19,3 @@ function gw() {
   # Call gradle
   "${result}" $*
 }
-

plugins/available/postgres.plugin.bash

@@ -84,4 +84,3 @@ function postgres_serverlog {
 #   tail -500 $PGDATA/pg_log/`ls -Art $PGDATA/pg_log | tail -n 1` | less
 # }
 #
-

plugins/available/sdkman.plugin.bash

@@ -6,4 +6,3 @@ about-plugin 'Load Software Development Kit Manager'
 export SDKMAN_DIR=${SDKMAN_DIR:-$HOME/.sdkman}
 
 [[ -s "${SDKMAN_DIR}/bin/sdkman-init.sh" ]] && source "${SDKMAN_DIR}/bin/sdkman-init.sh"
-

themes/gitline/powerline.base.bash

@@ -225,4 +225,3 @@ function __powerline_prompt_command {
         LEFT_PROMPT \
         SEGMENTS_AT_LEFT
 }
-

themes/liquidprompt/.gitignore

@@ -1,2 +1 @@
 liquidprompt
-

themes/nwinkler_random_colors/README.md

@@ -26,4 +26,3 @@ Here it is in action:
 ## Usage Scenario
 
 This theme is especially useful when connecting to many different machines and switching between them often. Yes, the hostname *is* present in the prompt. But I argue that it's a lot faster to get a "feel" of what machine you are currently on because of the custom colors on that machine's prompt than by reading the hostname.
-

themes/powerline/powerline.base.bash

@@ -280,4 +280,3 @@ function __powerline_prompt_command {
         LEFT_PROMPT \
         SEGMENTS_AT_LEFT
 }
-

themes/powerturk/powerturk.theme.bash

@@ -182,4 +182,3 @@ function powerline_prompt_command() {
 }
 
 PROMPT_COMMAND=powerline_prompt_command
-