From 8fb52ec8f2fd300109890557b47189cb9f4fa1d0 Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Thu, 18 May 2023 11:58:51 +0300
Subject: [PATCH] add shfmt

---
 .mikaela_install        | 22 ++++++++++-----------
 .pre-commit-config.yaml |  7 +++++++
 etc/install             |  8 ++++----
 install                 | 42 ++++++++++++++++++++---------------------
 4 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/.mikaela_install b/.mikaela_install
index 676473ea..4f507d94 100755
--- a/.mikaela_install
+++ b/.mikaela_install
@@ -2,19 +2,19 @@
 # Do not use this script unless you know what you are doing!
 set -x
 git verify-commit HEAD
-cat .mikaela/bash_aliases> ~/.bash_aliases
-cat .mikaela/zsh_aliases > ~/.zsh_aliases
-cat .mikaela/gitconfig > ~/.gitconfig
-cat rc/xinitrc > ~/.xinitrc
+cat .mikaela/bash_aliases >~/.bash_aliases
+cat .mikaela/zsh_aliases >~/.zsh_aliases
+cat .mikaela/gitconfig >~/.gitconfig
+cat rc/xinitrc >~/.xinitrc
 mkdir -p ~/.gnupg
-cat .mikaela/gpg.conf> ~/.gnupg/gpg.conf
-cat .mikaela/pastebinit.xml > ~/.pastebinit.xml
-cat .mikaela/environment > ~/.environment
-cat .mikaela/gitconfig > ~/.gitconfig
+cat .mikaela/gpg.conf >~/.gnupg/gpg.conf
+cat .mikaela/pastebinit.xml >~/.pastebinit.xml
+cat .mikaela/environment >~/.environment
+cat .mikaela/gitconfig >~/.gitconfig
 mkdir -p ~/.ssh
-cat .mikaela/keys/authorized_keys > ~/.ssh/authorized_keys
-cat etc/ssh/ssh_config > ~/.ssh/config
-cat .editorconfig > ~/.editorconfig
+cat .mikaela/keys/authorized_keys >~/.ssh/authorized_keys
+cat etc/ssh/ssh_config >~/.ssh/config
+cat .editorconfig >~/.editorconfig
 touch ~/.MIKAELA_GREP
 set +x
 # vim : set ft=sh :
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d5ba3e14..1b038689 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -80,6 +80,13 @@ repos:
   #     - id: black
   #- id: black-jupyter
 
+  # Shell code formatter, requires Go
+  - repo: https://github.com/scop/pre-commit-shfmt
+    rev: v3.6.0-2
+    hooks:
+      - id: shfmt
+        #- id: shfmt-docker
+
   # .editorconfig validity checking
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
     rev: "2.7.1"
diff --git a/etc/install b/etc/install
index bad0d48c..f3f4e21e 100755
--- a/etc/install
+++ b/etc/install
@@ -2,20 +2,20 @@
 # FOR MY PERSONAL USE ONLY!
 
 mkdir -p /etc/
-cat oidentd.conf > /etc/oidentd.conf
+cat oidentd.conf >/etc/oidentd.conf
 chmod a+r /etc/oidentd.conf
 
 mkdir -p /etc/profile.d/
-cat profile.d/mikaela.sh > /etc/profile.d/mikaela.sh
+cat profile.d/mikaela.sh >/etc/profile.d/mikaela.sh
 chmod a+r /etc/profile.d/mikaela.sh
 
 mkdir -p /etc/systemd/system/
-cat systemd/system/oidentd.socket > /etc/systemd/system/oidentd.socket
+cat systemd/system/oidentd.socket >/etc/systemd/system/oidentd.socket
 chmod a+r /etc/systemd/system/oidentd.socket
 
 mkdir -p /etc/sysctl.d/
 if [ ! -f /etc/sysctl.d/60-mikaela.conf ]; then
-	cat sysctl.d/60-mikaela.conf > /etc/sysctl.d/60-mikaela.conf
+	cat sysctl.d/60-mikaela.conf >/etc/sysctl.d/60-mikaela.conf
 	chmod a+r /etc/sysctl.d/60-mikaela.conf
 fi
 
diff --git a/install b/install
index d14cab55..50cdd932 100755
--- a/install
+++ b/install
@@ -6,48 +6,46 @@ git verify-commit HEAD
 
 export MIKAELA_GREP=$HOME/.MIKAELA_GREP
 
-cat rc/bashrc > ~/.bashrc
-cat conf/tmux.conf > ~/.tmux.conf
-cat rc/zshrc > ~/.zshrc
-cat rc/profile > ~/.profile
-cat conf/gitconfig > ~/.gitconfig
+cat rc/bashrc >~/.bashrc
+cat conf/tmux.conf >~/.tmux.conf
+cat rc/zshrc >~/.zshrc
+cat rc/profile >~/.profile
+cat conf/gitconfig >~/.gitconfig
 mkdir -p ~/.git-template
-cat rc/vimrc > ~/.vimrc
+cat rc/vimrc >~/.vimrc
 mkdir -p ~/.config/nvim/
-cat conf/init.vim > ~/.config/nvim/init.vim
-cat conf/makepkg.conf > ~/.makepkg.conf
+cat conf/init.vim >~/.config/nvim/init.vim
+cat conf/makepkg.conf >~/.makepkg.conf
 mkdir -p ~/.config/mpv/
-cat conf/mpv.conf > ~/.config/mpv/mpv.conf
+cat conf/mpv.conf >~/.config/mpv/mpv.conf
 if [ ! -f ~/.oidentd.conf ]; then
-	cat conf/oidentd.conf > ~/.oidentd.conf
+	cat conf/oidentd.conf >~/.oidentd.conf
 fi
 mkdir -p ~/.gnupg
-cat gpg/gpg.conf > ~/.gnupg/gpg.conf
-cat gpg/gpg-agent.conf > ~/.gnupg/gpg-agent.conf
-cat gpg/dirmngr.conf > ~/.gnupg/dirmngr.conf
+cat gpg/gpg.conf >~/.gnupg/gpg.conf
+cat gpg/gpg-agent.conf >~/.gnupg/gpg-agent.conf
+cat gpg/dirmngr.conf >~/.gnupg/dirmngr.conf
 killall -HUP dirmngr
 #cat rc/xinitrc > ~/.xinitrc
-cat conf/pastebinit.xml > ~/.pastebinit.xml
-cat conf/Xresources > ~/.Xresources
+cat conf/pastebinit.xml >~/.pastebinit.xml
+cat conf/Xresources >~/.Xresources
 mkdir -p ~/.inxi
-cat conf/inxi.conf > ~/.inxi/inxi.conf
-gpg --quiet --import .mikaela/keys/*.asc&
+cat conf/inxi.conf >~/.inxi/inxi.conf
+gpg --quiet --import .mikaela/keys/*.asc &
 mkdir -p ~/.ssh/sockets/
 chmod a+xr chmod
-bash -x ./chmod&
+bash -x ./chmod &
 
 if hash pre-commit 2>/dev/null; then
 	pre-commit init-templatedir ~/.git-template
 	pre-commit gc
 fi
 
-if [ -f $HOME/.MIKAELAGREP ]
-then
+if [ -f $HOME/.MIKAELAGREP ]; then
 	mv $HOME/.MIKAELAGREP $MIKAELA_GREP
 fi
 
-if [ -f "$MIKAELA_GREP" ]
-then
+if [ -f "$MIKAELA_GREP" ]; then
 	bash -x .mikaela_install
 fi