- 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

@@ -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'

.githooks/post-merge

 #!/bin/sh
 set -eu
 cd "$(git rev-parse --show-toplevel)"
-. ./.bashrc
-gen-ssh-config
+echo Generating SSH config
+Documents/bin/gen-ssh-config

.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

Documents/bin/dma-clean

+#!/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

Documents/bin/gen-ssh-config

+#!/bin/sh
+set -eu
+find "$HOME/.ssh/config.d/" -type f -exec cat {} \; > "$HOME/.ssh/config"