From 10555ebac7524a17596a4077bd531988132f9d4a Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 23 Mar 2019 14:11:34 +0200
Subject: [PATCH] Added pre-commit hook to remove trailing whitespace, removed
found trailing whitespace.
---
.aspell.en.pws | 2 +-
.config/user-dirs.dirs | 2 +-
.pre-commit-config.yaml | 1 +
Makefile | 4 ++--
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.aspell.en.pws b/.aspell.en.pws
index e0bb31b..ea4ffb6 100644
--- a/.aspell.en.pws
+++ b/.aspell.en.pws
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 158
+personal_ws-1.1 en 158
cfg
runtime
Nginx
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 0d19da4..ea3a3a4 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -4,7 +4,7 @@
# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
# absolute path. No other format is supported.
-#
+#
XDG_DESKTOP_DIR="$HOME/Desktop"
XDG_DOWNLOAD_DIR="$HOME/Downloads"
XDG_TEMPLATES_DIR="$HOME/Templates"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ed4a5c2..b5936d1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,6 +8,7 @@ repos:
- id: check-merge-conflict
- id: check-symlinks
- id: detect-private-key
+ - id: trailing-whitespace
- id: flake8
exclude: pythonrc.py
- repo: https://www.shore.co.il/git/shell-pre-commit/
diff --git a/Makefile b/Makefile
index 400cdf8..19ad86b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,13 @@ download = curl --silent --location --fail --output $@
all: .config/pythonrc.py .ssh/config .bash_completion.d/aws .bash_completion.d/docker-compose .bash_completion.d/docker-machine.bash .bash_completion.d/docker-machine.bash .travis/travis.sh binaries
-binaries: .local/share/bfg/bfg.jar .local/bin/rke .local/bin/docker-machine .local/bin/packer .local/bin/terraform .local/bin/vault .local/bin/kubectl .local/bin/kops .local/bin/kompose .local/bin/minikube
+binaries: .local/share/bfg/bfg.jar .local/bin/rke .local/bin/docker-machine .local/bin/packer .local/bin/terraform .local/bin/vault .local/bin/kubectl .local/bin/kops .local/bin/kompose .local/bin/minikube
.ssh/config: $(ssh_configs)
find ".ssh/config.d/" -type f \! -name '.*' -print0 | sort --zero | xargs -0 cat > ".ssh/config"
.bash_completion.d/docker-compose:
- $(download) https://raw.githubusercontent.com/docker/compose/1.23.2/contrib/completion/bash/docker-compose
+ $(download) https://raw.githubusercontent.com/docker/compose/1.23.2/contrib/completion/bash/docker-compose
.bash_completion.d/docker-machine.bash:
$(download) https://raw.githubusercontent.com/docker/machine/v0.16.0/contrib/completion/bash/docker-machine.bash
--
GitLab