julian/scale-catalog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move mount over to use heavyscript library

Browse Source
This commit is contained in:
Kjeld Schouten-Lebbing 2022-12-27 13:09:00 +01:00
parent 520caadacf
commit 3a1d22eebc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
functions/mount.sh
View File

@ -63,7 +63,7 @@ do
else else
echo -e "\nMounted\n$data_name" echo -e "\nMounted\n$data_name"
fi fi
echo -e "\nUnmount with:\nzfs set mountpoint=legacy $full_path && rmdir /mnt/heavyscript/$data_name\n\nOr use the Unmount All option\n" echo -e "\nUnmount with:\nzfs set mountpoint=legacy $full_path && rmdir /mnt/truetool/$data_name\n\nOr use the Unmount All option\n"
#Ask if user would like to mount something else #Ask if user would like to mount something else
while true while true
@ -89,7 +89,7 @@ do
done done
;; ;;
2) 2)
mapfile -t unmount_array < <(basename -a /mnt/heavyscript/* | sed "s/*//") mapfile -t unmount_array < <(basename -a /mnt/truetool/* | sed "s/*//")
[[ -z ${unmount_array[*]} ]] && echo "Theres nothing to unmount" && sleep 3 && continue [[ -z ${unmount_array[*]} ]] && echo "Theres nothing to unmount" && sleep 3 && continue
for i in "${unmount_array[@]}" for i in "${unmount_array[@]}"
do do
@ -98,9 +98,9 @@ do
pvc=$(echo "$main" | awk '{print $3}') pvc=$(echo "$main" | awk '{print $3}')
full_path=$(find /mnt/"$pool"/ix-applications/releases/"$app"/volumes/ -maxdepth 0 | cut -c 6-) full_path=$(find /mnt/"$pool"/ix-applications/releases/"$app"/volumes/ -maxdepth 0 | cut -c 6-)
zfs set mountpoint=legacy "$full_path""$pvc" zfs set mountpoint=legacy "$full_path""$pvc"
echo "$i unmounted" && rmdir /mnt/heavyscript/"$i" || echo "failed to unmount $i" echo "$i unmounted" && rmdir /mnt/truetool/"$i" || echo "failed to unmount $i"
done done
rmdir /mnt/heavyscript rmdir /mnt/truetool
sleep 3 sleep 3
;; ;;
*) *)

2
truetool.sh
View File

@ -38,6 +38,8 @@ source includes/update_self.sh
source functions/dns.sh source functions/dns.sh
# shellcheck source=functions/misc.sh # shellcheck source=functions/misc.sh
source functions/misc.sh source functions/misc.sh
# shellcheck source=functions/mount.sh
source functions/mount.sh
#If no argument is passed, set flag to show menu #If no argument is passed, set flag to show menu
if [[ -z "$*" || "-" == "$*" || "--" == "$*" ]]; then if [[ -z "$*" || "-" == "$*" || "--" == "$*" ]]; then