submodule the PPFI IM repo for some more of my scripts

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "submodules/gist"]
 	path = submodules/gist
 	url = https://gitea.blesmrt.net/mikaela/gist.git
+[submodule "submodules/PPFI-Pikaviestimet"]
+	path = submodules/PPFI-Pikaviestimet
+	url = https://git.piraattipuolue.fi/Pikaviestimet/Pikaviestimet.git

.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/.gitignore

@@ -8,3 +8,5 @@ forgejo-*
 backup-ops2l-vmc.bash
 generate-vcard-qr.bash
 install-cht.bash
+gist-irc-piraatit
+PPFI-IM-IRC

bash/PPFI-IM-IRC

@@ -0,0 +1 @@
+../submodules/PPFI-Pikaviestimet/irc/

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

@@ -22,8 +22,7 @@ if hash jami-gnome 2>/dev/null; then
 fi
 
 # Telegram.org
-if [ -f ~/.local/Telegram/Updater ]
+if [ -f ~/.local/Telegram/Updater ]; then
-then
 	(~/.local/Telegram/Updater -many -startintray &)
 else
 	if hash telegram-desktop 2>/dev/null; then

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/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=""

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=""

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/gist-irc-piraatit

@@ -0,0 +1 @@
+../submodules/gist/irc/piraatit/

bash/transmission-export-magnets.bash

@@ -6,8 +6,7 @@ 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/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/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/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"

submodules/PPFI-Pikaviestimet

@@ -0,0 +1 @@
+Subproject commit 7da91232880f879b3f2feb0e6ca32432bfdcac35

submodules/gist

@@ -1 +1 @@
-Subproject commit a6f73dbad72d5958bec7e899bd27050f22b36a93
+Subproject commit fa9e8927c0b82f8b30209ef0c6a73d8a78d9f17c