From f30effa5855b79ec1392c342b3431c1cd3b9300e Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 29 May 2017 17:43:34 +0300
Subject: [PATCH] - Notify about generating SSH config in the post-merge git
hook. - Added Documents/bin directory for scripts, moved renew-certs,
train-wifi and dma-clean (wasn't commited before) there. - Made
gen-ssh-config a script (in Documents/bin) instead of a shell alias. Call
said script in the post-merge git hook (instead of sourcing bashrc which
currently just exits if not running interactively which I like to keep
doing). Added said scripts to pre-commit.
---
.bashrc | 2 +-
.githooks/post-merge | 4 ++--
.pre-commit-config.yaml | 2 +-
Documents/bin/dma-clean | 6 ++++++
Documents/bin/gen-ssh-config | 3 +++
Documents/{Shore => bin}/renew-certs | 0
Documents/{ => bin}/train-wifi | 0
7 files changed, 13 insertions(+), 4 deletions(-)
create mode 100755 Documents/bin/dma-clean
create mode 100755 Documents/bin/gen-ssh-config
rename Documents/{Shore => bin}/renew-certs (100%)
rename Documents/{ => bin}/train-wifi (100%)
diff --git a/.bashrc b/.bashrc
index b9cbac3..3b2c80a 100644
--- a/.bashrc
+++ b/.bashrc
@@ -48,6 +48,7 @@ export PATH=$PATH:$HOME/Documents/Shore/cleanup
export PATH=$PATH:$HOME/Documents/Shore/ssh-ca
export PATH=$PATH:$HOME/Documents/Shore/ssl-ca
export PATH=$PATH:$HOME/.cargo/bin
+export PATH=$PATH:$HOME/Documents/bin
export PYTHONSTARTUP=~/.pythonstartup
export AWS_DEFAULT_PROFILE='shore'
export ANSIBLE_VERBOSITY=2
@@ -64,7 +65,6 @@ alias missing-recommends="aptitude search '~RBrecommends:~i'"
alias deinstalled="dpkg --get-selections | awk '\$2==\"deinstall\" {print \$1}'"
alias ansible-local='ansible localhost -c local -i localhost,'
alias ansible-local-playbook='ansible-playbook -i localhost, -c local'
-alias gen-ssh-config='cat $HOME/.ssh/config.d/* > $HOME/.ssh/config'
alias concat="perl -pe 's/\n/\\\n/g'"
alias deconcat="perl -pe 's/\\\n/\n/g'"
alias ggo='sudo GOPATH=/usr/share/go go'
diff --git a/.githooks/post-merge b/.githooks/post-merge
index eca1139..be076ab 100755
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -1,5 +1,5 @@
#!/bin/sh
set -eu
cd "$(git rev-parse --show-toplevel)"
-. ./.bashrc
-gen-ssh-config
+echo Generating SSH config
+Documents/bin/gen-ssh-config
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e3febfd..b27a80b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,6 +9,6 @@
sha: v0.5.3
hooks:
- id: shell-lint
- files: &shellscripts 'bashrc|post-merge|profile|docker-|train-wifi|renew-certs'
+ files: &shellscripts 'bashrc|post-merge|profile|docker-|train-wifi|renew-certs|dma-clean|gen-ssh-config'
- id: shellcheck
files: *shellscripts
diff --git a/Documents/bin/dma-clean b/Documents/bin/dma-clean
new file mode 100755
index 0000000..47931c3
--- /dev/null
+++ b/Documents/bin/dma-clean
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -eu
+service cron stop
+ps aux | awk '/dma|send-mail/ {print $2}' | xargs kill
+find /var/spool/dma \! -name flush -delete
+service cron start
diff --git a/Documents/bin/gen-ssh-config b/Documents/bin/gen-ssh-config
new file mode 100755
index 0000000..9f5bf14
--- /dev/null
+++ b/Documents/bin/gen-ssh-config
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -eu
+find "$HOME/.ssh/config.d/" -type f -exec cat {} \; > "$HOME/.ssh/config"
diff --git a/Documents/Shore/renew-certs b/Documents/bin/renew-certs
similarity index 100%
rename from Documents/Shore/renew-certs
rename to Documents/bin/renew-certs
diff --git a/Documents/train-wifi b/Documents/bin/train-wifi
similarity index 100%
rename from Documents/train-wifi
rename to Documents/bin/train-wifi
--
GitLab