add & run shfmt

.pre-commit-config.yaml

@@ -40,6 +40,11 @@ repos:
     hooks:
       - id: black
       #- id: black-jupyter
+  - repo: https://github.com/scop/pre-commit-shfmt
+    rev: v3.6.0-2
+    hooks:
+      - id: shfmt
+        #- id: shfmt-docker
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
     rev: "2.7.1"
     hooks:

bash/T2L-apps.bash

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 mkdir -p ~/.config/T2L-telegram
-telegram-desktop -many -workdir ~/.config/T2L-telegram -startintray&
+telegram-desktop -many -workdir ~/.config/T2L-telegram -startintray &
 #flatpak run im.riot.Riot --profile T2L --hidden --proxy --proxy-server=127.0.0.1:9119&

bash/acmesh-ssl.bash

@@ -64,7 +64,7 @@ chown -R oragono:oragono $ORAGONODIR
 
 # WeeChat relay, remember to /relay sslcertkey
 $ACMESH -d $DOMAINNAME --fullchain-file $WEECHATDIR/fullchain.pem --key-file $WEECHATDIR/privkey.pem
-cat $WEECHATDIR/{fullchain,privkey}.pem > $WEECHATDIR/relay.pem
+cat $WEECHATDIR/{fullchain,privkey}.pem >$WEECHATDIR/relay.pem
 chmod -R 700 $WEECHATDIR
 chown -R mikaela:mikaela $WEECHATDIR
 

bash/addusers

@@ -4,8 +4,7 @@
 # installations. I am too lazy to always do this by hand!
 
 # Loop with the users
-for user in mikaela matti tommi tiina nenne anneli
+for user in mikaela matti tommi tiina nenne anneli; do
-do
 	# To see that it works
 	echo "Current user: $user"
 	# Create the user & homedir if it doesn't exist
@@ -21,8 +20,7 @@ do
 done
 
 # And next sudoers
-for sudoer in mikaela matti tommi tiina
+for sudoer in mikaela matti tommi tiina; do
-do
 	# Add the user to sudo group (as they are administrator)
 	echo "Current sudoer: $sudoer"
 	usermod -a -G wheel $sudoer

bash/comms.bash

@@ -8,47 +8,46 @@ set -x
 
 # XMPP
 if hash dino 2>/dev/null; then
-	(dino&)
+	(dino &)
 fi
 if hash gajim 2>/dev/null; then
-	(gajim&)
+	(gajim &)
 else
-	(flatpak run org.gajim.Gajim --quiet&)
+	(flatpak run org.gajim.Gajim --quiet &)
 fi
 
 # Jami, mostly P2P app
 if hash jami-gnome 2>/dev/null; then
-	(jami-gnome -r&)
+	(jami-gnome -r &)
 fi
 
 # Telegram.org
-if [ -f ~/.local/Telegram/Updater ]
+if [ -f ~/.local/Telegram/Updater ]; then
-then
+	(~/.local/Telegram/Updater -many -startintray &)
-	(~/.local/Telegram/Updater -many -startintray&)
 else
-if hash telegram-desktop 2>/dev/null; then
+	if hash telegram-desktop 2>/dev/null; then
-	(telegram-desktop -many -startintray&)
+		(telegram-desktop -many -startintray &)
 	fi
 fi
 
 # Keybase
 if hash run_keybase 2>/dev/null; then
-	(run_keybase&)
+	(run_keybase &)
 fi
 
 # Steam
 if hash steam 2>/dev/null; then
-	(STEAM_FRAME_FORCE_CLOSE=1 steam -silent&)
+	(STEAM_FRAME_FORCE_CLOSE=1 steam -silent &)
 fi
 
 # Signal
-(flatpak run org.signal.Signal --start-in-tray&)
+(flatpak run org.signal.Signal --start-in-tray &)
 
 # Microsoft Teams
-(flatpak run com.microsoft.Teams&)
+(flatpak run com.microsoft.Teams &)
 
 # IRC/HexChat
-(flatpak run io.github.Hexchat&)
+(flatpak run io.github.Hexchat &)
 
 # Matrix
 # Elements (previously Riot) perform poorly with this script, use container

bash/deb-update.bash

@@ -105,8 +105,7 @@ if hash needrestart 2>/dev/null; then
 fi
 
 # Sedric workaround, located in this repo. I trust /root/
-if [ -f /root/fixgrub.bash ]
+if [ -f /root/fixgrub.bash ]; then
-then
 	/root/fixgrub.bash
 fi
 

bash/deprecated/certbot-ssl.sh

@@ -16,4 +16,4 @@ chown -R mumble-server:mumble-server /var/lib/mumble-server/ssl/
 pkill $(cat /var/run/mumble-server/mumble-server.pid) -USR1
 
 # ZNC via https://wiki.znc.in/Signed_SSL_certificate#Certbot
-cat /etc/letsencrypt/live/relpda.mikaela.info/{privkey,fullchain}.pem > /home/znc/.znc/znc.pem
+cat /etc/letsencrypt/live/relpda.mikaela.info/{privkey,fullchain}.pem >/home/znc/.znc/znc.pem

bash/deprecated/ydns-simple

@@ -11,7 +11,6 @@
 ## Copy-paste the following to your crontab without the #
 # */5 * * * * /usr/local/bin/ydns-simple >/dev/null 2>&1
 
-
 # yDNS details
 USEREMAIL=""
 PASSWORD=""
@@ -47,7 +46,7 @@ fi
 if [ "$WAN_IP4" = "$OLD_WAN_IP4" ]; then
 	echo "IP4 Unchanged"
 else
-	echo $WAN_IP4 > $HOME/.wan_ip4-ydns.txt
+	echo $WAN_IP4 >$HOME/.wan_ip4-ydns.txt
 	echo "Updating DNS to $WAN_IP4"
 	curl -4 --basic -u "$USEREMAIL:$PASSWORD" --silent \
 		https://ydns.eu/api/v1/update/?host=$HOSTNAME
@@ -57,7 +56,7 @@ fi
 if [ "$WAN_IP6" = "$OLD_WAN_IP6" ]; then
 	echo "IP6 Unchanged"
 else
-	echo $WAN_IP6 > $HOME/.wan_ip6-ydns.txt
+	echo $WAN_IP6 >$HOME/.wan_ip6-ydns.txt
 	echo "Updating DNS to $WAN_IP6"
 	curl -6 --basic -u "$USEREMAIL:$PASSWORD" --silent \
 		https://ydns.eu/api/v1/update/?host=$HOSTNAME

bash/deprecated/ydns6

@@ -16,7 +16,6 @@
 ## Copy-paste the following to your crontab without the #
 # */5 * * * * PATH_TO_HOME_DIRECTORY_HERE/.local/bin/ydns6 >/dev/null 2>&1
 
-
 # yDNS details
 USEREMAIL=""
 PASSWORD=""
@@ -39,7 +38,7 @@ fi
 if [ "$WAN_IP6" = "$OLD_WAN_IP6" ]; then
 	echo "IP6 Unchanged"
 else
-	echo $WAN_IP6 > $HOME/.ydns6.txt
+	echo $WAN_IP6 >$HOME/.ydns6.txt
 	echo "Updating DNS to $WAN_IP6"
 	curl -6 --basic -u "$USEREMAIL:$PASSWORD" --silent \
 		https://ydns.io/api/v1/update/?host=$HOSTNAME\&ip=$WAN_IP6

bash/download-forgejo.bash

@@ -3,8 +3,7 @@ VERSION=1.19.1-0
 PLATFORM=linux-amd64
 
 # If the signature is already downloaded, don't redownload it
-if [ -f "forgejo-$VERSION-$PLATFORM.asc" ]
+if [ -f "forgejo-$VERSION-$PLATFORM.asc" ]; then
-then
 	printf "Forĝejo signature already downloaded.\n"
 else
 	printf "Downloading Forĝejo $VERSION-$PLATFORM signature…\n"
@@ -12,8 +11,7 @@ else
 fi
 
 # If the binary is already downloaded, don't redownload it
-if [ -f "forgejo-$VERSION-$PLATFORM" ]
+if [ -f "forgejo-$VERSION-$PLATFORM" ]; then
-then
 	printf "Forĝejo already downloaded.\n"
 else
 	printf "Downloading Forĝejo $VERSION on $PLATFORM…\n"

bash/fixgrub.bash

@@ -9,8 +9,7 @@ set -x
 # This script is Fedora specific for now.
 
 # There is no reason to run if dnf hasn't moved the proper config aside.
-if [ -f /boot/efi/EFI/fedora/grub.cfg.rpmsave ]
+if [ -f /boot/efi/EFI/fedora/grub.cfg.rpmsave ]; then
-then
 	rm -f /boot/efi/EFI/fedora/grub.cfg.rpmsave
 	grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
 fi

bash/piratepartyfinland/qr-generator-wellBeingRegionElections2022.bash

@@ -11,7 +11,7 @@ cd $TARGETDIR
 echo "Creating to $TARGETDIR"
 
 # Function to generate QRs based on our URL scheme
-function generateQr () {
+function generateQr() {
 	# $2 is first for the output as there are more regions than associations,
 	#  avoids overwriting
 	# -H = 30 % damage allowing highest error correction

bash/swaymirror.bash

@@ -7,7 +7,7 @@
 set -x
 
 # -r mirrors cursor, eDP-1 is the internal display name on lumina to be mirrored
-wayvnc ::1 -r -o eDP-1&
+wayvnc ::1 -r -o eDP-1 &
 
 # So I won't forget it and think something broke
 notify-send "Remember to Mod-Shift-NUM to exit black screen"

bash/transmission-export-magnets.bash

@@ -2,12 +2,11 @@
 
 # Get the number of torrents, begins from 2 (1 is header line), the last
 # line is SUM.
-TORRENTS=$(transmission-remote -l|wc -l)
+TORRENTS=$(transmission-remote -l | wc -l)
 CURRENT=1
 
 # until $CURRENT equals $TORRENTS ?
-until [ $CURRENT -gt $TORRENTS ]
+until [ $CURRENT -gt $TORRENTS ]; do
-	do
 	# get the information for $CURRENT? Grep the magnet line and cut out the
 	# frist field ("Magnet: ") using awk?
 	transmission-remote -l -t $CURRENT -i | grep -i magnet | awk -F': ' '{print $2}'

bash/usr-local-bin/brave

@@ -6,6 +6,6 @@
 # OpenVPN: --proxy-server=socks5://10.8.0.1
 
 set -x
-/usr/bin/brave-browser-stable --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturerBraveVerticalTabs,EncryptedClientHello,UseDnsHttpsSvcbAlpn --ozone-platform-hint=auto  $@
+/usr/bin/brave-browser-stable --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturerBraveVerticalTabs,EncryptedClientHello,UseDnsHttpsSvcbAlpn --ozone-platform-hint=auto $@
 # --enable-features=,VaapiVideoDecoder,VaapiIgnoreDriverChecks,WebContentsForceDark --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --disable-gpu-driver-bug-workarounds --enable-native-gpu-memory-buffers
 set +x

bash/usr-local-bin/firefox

@@ -11,16 +11,13 @@ FlagsForFirefox="--ProfileManager $@"
 
 # Firefox (stable, beta) and signatures: https://releases.mozilla.org/pub/firefox/releases/
 # Developer edition (and signatures): https://releases.mozilla.org/pub/devedition/releases/
-if [ -f ~/.local/firefox/firefox ]
+if [ -f ~/.local/firefox/firefox ]; then
-then
 	~/.local/firefox/firefox $FlagsForFirefox
 # Fallback to global wayland installation
-elif [ -f /usr/bin/firefox-wayland ]
+elif [ -f /usr/bin/firefox-wayland ]; then
-then
 	/usr/bin/firefox-wayland $FlagsForFirefox
 # Fallback to global installation
-elif [ -f /usr/bin/firefox ]
+elif [ -f /usr/bin/firefox ]; then
-then
 	/usr/bin/firefox $FlagsForFirefox
 # Fallback to flatpak, don't care if it doesn't exist
 else

bash/usr-local-bin/fluffychat

@@ -5,11 +5,9 @@
 # bad.
 
 set -x
-if [ -f /snap/bin/fluffychat ]
+if [ -f /snap/bin/fluffychat ]; then
-then
 	snap run fluffychat $@
-elif [ -f /var/lib/flatpak/exports/bin/im.fluffychat.Fluffychat ]
+elif [ -f /var/lib/flatpak/exports/bin/im.fluffychat.Fluffychat ]; then
-then
 	flatpak run im.fluffychat.Fluffychat $@
 else
 	/usr/bin/fluffychat

bash/usr-local-bin/go

@@ -5,8 +5,7 @@
 set -x
 
 # Check if go is installed through snap
-if [ -f /snap/bin/go ]
+if [ -f /snap/bin/go ]; then
-then
 	snap run go $@
 
 # Fallback to system installation

bash/usr-local-bin/microsoft-edge

@@ -6,6 +6,6 @@
 # OpenVPN: --proxy-server=socks5://10.8.0.1
 
 set -x
-/usr/bin/microsoft-edge --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturers,EncryptedClientHello,UseDnsHttpsSvcbAlpn --ozone-platform-hint=auto  $@
+/usr/bin/microsoft-edge --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturers,EncryptedClientHello,UseDnsHttpsSvcbAlpn --ozone-platform-hint=auto $@
 # --enable-features=VaapiVideoDecoder,VaapiIgnoreDriverCheck -ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --disable-gpu-driver-bug-workarounds --enable-native-gpu-memory-buffers
 set +x

bash/usr-local-bin/thunderbird

@@ -10,16 +10,13 @@ export MOZ_ENABLE_WAYLAND=1
 FlagsForThunderbird="--ProfileManager $@"
 
 # Thunderbird (stable, beta) and signatures: https://releases.mozilla.org/pub/thunderbird/releases/
-if [ -f ~/.local/thunderbird/thunderbird ]
+if [ -f ~/.local/thunderbird/thunderbird ]; then
-then
 	~/.local/thunderbird/thunderbird $FlagsForThunderbird
 # Fallback to global installation
-elif [ -f /usr/bin/thunderbird-wayland ]
+elif [ -f /usr/bin/thunderbird-wayland ]; then
-then
 	/usr/bin/thunderbird-wayland $FlagsForThunderbird
 # Fallback to global installation
-elif [ -f /usr/bin/thunderbird ]
+elif [ -f /usr/bin/thunderbird ]; then
-then
 	/usr/bin/thunderbird $FlagsForThunderbird
 # Fallback to flatpak, don't care if it doesn't exist
 else

bash/usr-local-bin/vivaldi

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -x
-/usr/bin/vivaldi --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturers,EncryptedClientHello,UseDnsHttpsSvcbAlpn --ozone-platform-hint=auto  $@
+/usr/bin/vivaldi --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturers,EncryptedClientHello,UseDnsHttpsSvcbAlpn --ozone-platform-hint=auto $@
 set +x

bash/wifiqr.bash

@@ -13,7 +13,6 @@ qrencode -l H -s $PIXELSIZE -o $1.png "WIFI:T:WPA;S:$1;P:$2;;"
 # Might as well jpg this too
 convert "$1".png "$1".jpg
 
-
 # Prints details
 echo "SSID: $1"
 echo "Passphrase: $2"