Jafner/Jafner.net
1
0
Fork 0
Code Issues 16 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix try-catch blocks to make bash happy

Browse Source
This commit is contained in:
Joey Hafner 2024-03-02 17:21:06 -08:00
parent 96da89793c
commit fd103e833f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homelab/fighter/scripts/startup.sh
View File

@ -34,7 +34,7 @@ function mount_iscsi {
sudo mount /mnt/nas/iscsi
}
if "$1" == "clean"; then
if [ "$1" = "clean" ]; then
echo " ==== Cleaning up old containers"
# Clean up any remnants from unclean shutdown
docker stop $(docker ps -q) # shut down running containers
@ -46,13 +46,21 @@ fi
echo " ==== Checking iSCSI..."
if ! sudo iscsiadm -m session | grep -q 'iqn.2020-03.net.jafner:fighter'; then
echo " ====== Attempting to connect and mount iSCSI"
{ connect_iscsi && mount_iscsi && echo " ====== Success!" } || { echo " ====== Could not connect and mount iSCSI" }
{
connect_iscsi && mount_iscsi && echo " ====== Success!"
} || {
echo " ====== Could not connect and mount iSCSI"
}
fi
# Second check if mounted; attempt to mount if not mounted
if ! mount | grep -q '/mnt/nas/iscsi'; then
echo " ====== Attempting to mount /mnt/nas/iscsi"
{ mount_iscsi && echo " ====== Success!" } || { echo " ====== Could not mount /mnt/nas/iscsi" }
{
mount_iscsi && echo " ====== Success!"
} || {
echo " ====== Could not mount /mnt/nas/iscsi"
}
fi
# Regarding the above, we will attempt to re-mount the share if the first step successfully connected and then failed to mount.
# This is because I can't be bother to build more elegant logic.