From 496fe13c7f9cec2ed55ebbf3cb0193185953e686 Mon Sep 17 00:00:00 2001 From: Hannes Date: Wed, 21 Oct 2026 18:31:08 +0200 Subject: [PATCH] fix: added --no-confirm to arch update --- configs/alias_useful.fish | 8 ++-- configs/arch_config.fish | 2 +- scripts/mount.sh | 85 +++++++++++++++++++-------------------- 3 files changed, 47 insertions(+), 48 deletions(-) diff --git a/configs/alias_useful.fish b/configs/alias_useful.fish index 2a10600..f1210ca 100755 --- a/configs/alias_useful.fish +++ b/configs/alias_useful.fish @@ -5,10 +5,10 @@ alias mount_all='sudo $HOME/.config/fish/scripts/mount.sh' alias umount_all='sudo $HOME/.config/fish/scripts/umount.sh' -function mkdir - command mkdir $argv - and cd -- $argv[-1] -end +# function mkdir +# command mkdir $argv +# and cd -- $argv[-1] +# end ################ COMMON ALIASES ################################################ diff --git a/configs/arch_config.fish b/configs/arch_config.fish index 26de579..36d355a 100755 --- a/configs/arch_config.fish +++ b/configs/arch_config.fish @@ -205,7 +205,7 @@ function updateall echo "Pending pacman updates:" printf "%s\n" $qu_output end - sudo pacman -Syu + sudo pacman -Syu --noconfirm set -l pacman_code $status if test $pacman_code -eq 0 set pacman_status "updated" diff --git a/scripts/mount.sh b/scripts/mount.sh index 3011eb1..c3e025c 100755 --- a/scripts/mount.sh +++ b/scripts/mount.sh @@ -5,73 +5,72 @@ mount_cifs() { local source="$1" local mount_point="$2" local options="$3" - + # Create mount point if missing if [ ! -d "$mount_point" ]; then echo "Creating mount point: $mount_point" - sudo mkdir -p "$mount_point || { echo 'Mount point creation failed'; exit 1; }" + sudo mkdir -p "$mount_point" || { echo "Mount point creation failed for $mount_point"; return 1; } fi - + echo "Mounting $source to $mount_point with options: $options" - sudo mount -t cifs -o "$options" "$source" "$mount_point" || { + if ! sudo mount -t cifs -o "$options" "$source" "$mount_point"; then echo "Mount failed for $source. Check credentials and network." - exit 1 - } + return 1 + fi echo "Successfully mounted: $mount_point" + return 0 } -function is_mounted() { +is_mounted() { mountpoint -q "$1" } -# Mount FRITZ.NAS (from fstab line 1) +# --- Mount FRITZ.NAS --- if ! is_mounted "/home/honney/mount/fritzNAS"; then if ping -c 1 -W 1 "192.168.1.1" >/dev/null 2>&1; then mount_cifs "//192.168.1.1/FRITZ.NAS" \ "/home/honney/mount/fritzNAS" \ - "credentials=/home/honney/.cred/samba_credentials,uid=1000,gid=1000,vers=3.0,cache=none,nounix,noserverino,file_mode=0755,dir_mode=0755" + "credentials=/home/honney/.cred/samba_credentials,uid=1000,gid=1000,vers=3.0,cache=none,nounix,noserverino,file_mode=0755,dir_mode=0755" \ + || echo "WARNING: FRITZ.NAS mount failed, continuing..." + else + echo "192.168.1.1 unreachable, skipping FRITZ.NAS" fi fi echo "" + mount_points=("/home/honney/mount/Data" "/home/honney/mount/Media" "/home/honney/mount/Ripping" "/home/honney/mount/Apps") +share_names=("Data" "Media" "Ripping" "Apps") +# Determine which TrueNAS host is reachable +host="" if ping -c 1 -W 1 "192.168.188.122" >/dev/null 2>&1; then - echo "192.168.188.122, mounting shares..." - echo "" - mounts=("//192.168.188.122/Data" "//192.168.188.122/Media" "//192.168.188.122/Ripping" "//192.168.188.122/Apps") - for i in "${!mounts[@]}"; do - mount="${mounts[$i]}" - mount_point="${mount_points[$i]}" - echo "Checking $mount_point" - if ! is_mounted "$mount_point"; then - echo "$mount_point unmounted" - mount_cifs "$mount" \ - "$mount_point" \ - "credentials=/home/honney/.cred/trueNAS_credentials,vers=3.1.1,iocharset=utf8,rw,uid=1000,gid=1000,nounix,noperm,file_mode=0660,dir_mode=0770,hard,intr,cache=loose" - else - echo "$mount_point already mounted" - fi - echo "" - done - + host="192.168.188.122" + echo "192.168.188.122 reachable, mounting shares..." elif ping -c 1 -W 1 "100.64.0.3" >/dev/null 2>&1; then + host="100.64.0.3" echo "192.168.188.122 unreachable" echo "100.64.0.3 reachable, mounting shares..." - echo "" - mounts=("//100.64.0.3/Data" "//100.64.0.3/Media" "//100.64.0.3/Ripping" "//100.64.0.3/Apps") - for i in "${!mounts[@]}"; do - mount="${mounts[$i]}" - mount_point="${mount_points[$i]}" - echo "Checking $mount_point" - if ! is_mounted "$mount_point"; then - echo "$mount_point unmounted" - mount_cifs "$mount" \ - "$mount_point" \ - "credentials=/home/honney/.cred/trueNAS_credentials,vers=3.1.1,iocharset=utf8,rw,uid=1000,gid=1000,nounix,noperm,file_mode=0660,dir_mode=0770,hard,intr,cache=loose" - else - echo "$mount_point already mounted" - fi - echo "" - done +else + echo "Neither 192.168.188.122 nor 100.64.0.3 reachable, skipping TrueNAS mounts." + exit 0 fi + +echo "" + +for i in "${!mount_points[@]}"; do + mount_point="${mount_points[$i]}" + source="//${host}/${share_names[$i]}" + + echo "Checking $mount_point" + if is_mounted "$mount_point"; then + echo "$mount_point already mounted" + else + echo "$mount_point unmounted" + mount_cifs "$source" \ + "$mount_point" \ + "credentials=/home/honney/.cred/trueNAS_credentials,vers=3.1.1,iocharset=utf8,rw,uid=1000,gid=1000,nounix,noperm,file_mode=0660,dir_mode=0770,hard,intr,cache=loose" \ + || echo "WARNING: $mount_point mount failed, continuing..." + fi + echo "" +done \ No newline at end of file