Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2025-10-02 16:16:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update share-common.func

Browse Source
This commit is contained in:
MacRimi
2025-09-06 19:16:15 +02:00
parent 9b7b271580
commit d4ff2da473
1 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
scripts/global/share-common.func
View File

@@ -232,13 +232,13 @@ pmx_select_host_mount_point() {
local choice folder_name result existing_dirs mount_point local choice folder_name result existing_dirs mount_point
while true; do while true; do
choice=$(dialog --backtitle "ProxMenux" --title "$title" --menu "\n$(translate "Where do you want the host folder?")" 16 76 3 \ choice=$(whiptail --title "$title" --menu "$(translate "Where do you want the host folder?")" 16 76 3 \
"1" "$(translate "Create new folder in /mnt")" \ "1" "$(translate "Create new folder in /mnt")" \
"2" "$(translate "Use existing folder")" \
"3" "$(translate "Enter custom path")" 3>&1 1>&2 2>&3) || { echo ""; return 1; } "3" "$(translate "Enter custom path")" 3>&1 1>&2 2>&3) || { echo ""; return 1; }
case "$choice" in case "$choice" in
1) 1)
clear
folder_name=$(whiptail --inputbox "$(translate "Enter folder name for /mnt:")" 10 70 "$(basename "$default_path")" --title "$(translate "Folder Name")" 3>&1 1>&2 2>&3) || { echo ""; return 1; } folder_name=$(whiptail --inputbox "$(translate "Enter folder name for /mnt:")" 10 70 "$(basename "$default_path")" --title "$(translate "Folder Name")" 3>&1 1>&2 2>&3) || { echo ""; return 1; }
[[ -z "$folder_name" ]] && continue [[ -z "$folder_name" ]] && continue
mount_point="/mnt/$folder_name" mount_point="/mnt/$folder_name"
@@ -246,7 +246,23 @@ pmx_select_host_mount_point() {
;; ;;
2) 2)
clear existing_dirs=($(ls -1d /mnt/*/ 2>/dev/null | sed 's:/$::'))
if [[ ${#existing_dirs[@]} -eq 0 ]]; then
whiptail --msgbox "$(translate "No existing folders found in /mnt")" 8 60
continue
fi
mount_point=$(whiptail --title "$(translate "Select Existing Folder")" \
--menu "$(translate "Choose a folder in /mnt:")" 20 70 10 \
$(for d in "${existing_dirs[@]}"; do echo "$d" "$(basename "$d")"; done) \
3>&1 1>&2 2>&3) || continue
if [[ "$context" =~ ^(nfs|samba)$ ]] && [[ -n "$(ls -A "$mount_point" 2>/dev/null)" ]]; then
whiptail --yesno "$(translate "Warning: The selected folder is not empty. Files may not be accessible once the network share is mounted. Proceed anyway?")" 12 70 || continue
fi
echo "$mount_point"; return 0
;;
3)
result=$(whiptail --inputbox "$(translate "Enter full path:")" 10 80 "$default_path" --title "$(translate "Custom Path")" 3>&1 1>&2 2>&3) || { echo ""; return 1; } result=$(whiptail --inputbox "$(translate "Enter full path:")" 10 80 "$default_path" --title "$(translate "Custom Path")" 3>&1 1>&2 2>&3) || { echo ""; return 1; }
[[ -z "$result" ]] && continue [[ -z "$result" ]] && continue
echo "$result"; return 0 echo "$result"; return 0
@@ -261,10 +277,16 @@ pmx_select_host_mount_point() {
select_host_directory() { select_host_directory() {
local method choice result local method choice result
method=$(dialog --clear --backtitle "ProxMenux" --title "$(translate "Select Host Directory")" --menu "\n$(translate "How do you want to select the HOST folder to mount?")" 15 70 4 \ method=$(whiptail --title "$(translate "Select Host Directory")" --menu "$(translate "How do you want to select the HOST folder to mount?")" 15 70 4 \
"mnt" "$(translate "Select from /mnt directories")" \ "mnt" "$(translate "Select from /mnt directories")" \
"manual" "$(translate "Enter path manually")" 3>&1 1>&2 2>&3) || return 1 "manual" "$(translate "Enter path manually")" 3>&1 1>&2 2>&3) || return 1
@@ -285,11 +307,11 @@ select_host_directory() {
return 1 return 1
fi fi
result=$(dialog --title "$(translate "Select Host Folder")" \ result=$(whiptail --title "$(translate "Select Host Folder")" \
--menu "\n$(translate "Select the folder to mount:")" 20 80 10 "${options[@]}" 3>&1 1>&2 2>&3) --menu "$(translate "Select the folder to mount:")" 20 80 10 "${options[@]}" 3>&1 1>&2 2>&3)
;; ;;
manual) manual)
result=$(dialog --title "$(translate "Enter Path")" \ result=$(whiptail --title "$(translate "Enter Path")" \
--inputbox "$(translate "Enter the full path to the host folder:")" 10 70 "/mnt/" 3>&1 1>&2 2>&3) --inputbox "$(translate "Enter the full path to the host folder:")" 10 70 "/mnt/" 3>&1 1>&2 2>&3)
;; ;;
esac esac
@@ -350,8 +372,8 @@ select_container_mount_point() {
local choice mount_point existing_dirs options local choice mount_point existing_dirs options
while true; do while true; do
choice=$(dialog --backtitle "ProxMenux" --title "$(translate "Configure Mount Point inside LXC")" \ choice=$(whiptail --title "$(translate "Configure Mount Point inside LXC")" \
--menu "\n$(translate "Where to mount inside container?")" 18 70 5 \ --menu "$(translate "Where to mount inside container?")" 18 70 5 \
"1" "$(translate "Create new directory in /mnt")" \ "1" "$(translate "Create new directory in /mnt")" \
"2" "$(translate "Use existing directory in /mnt")" \ "2" "$(translate "Use existing directory in /mnt")" \
"3" "$(translate "Enter path manually")" \ "3" "$(translate "Enter path manually")" \
@@ -359,30 +381,32 @@ select_container_mount_point() {
case "$choice" in case "$choice" in
1) 1)
mount_point=$(dialog --inputbox "\n$(translate "Enter folder name for /mnt in LXC:")" 10 60 "shared" 3>&1 1>&2 2>&3) || continue mount_point=$(whiptail --inputbox "$(translate "Enter folder name for /mnt:")" 10 60 "shared" 3>&1 1>&2 2>&3) || continue
[[ -z "$mount_point" ]] && continue [[ -z "$mount_point" ]] && continue
mount_point="/mnt/$mount_point" mount_point="/mnt/$mount_point"
pct exec "$ctid" -- mkdir -p "$mount_point" 2>/dev/null pct exec "$ctid" -- mkdir -p "$mount_point" 2>/dev/null
;; ;;
2) 2)
#existing_dirs=$(pct exec "$ctid" -- ls -1 /mnt 2>/dev/null | awk '{print "/mnt/"$1" "$1}')
existing_dirs=$(pct exec "$ctid" -- find /mnt -mindepth 1 -maxdepth 1 -type d 2>/dev/null | sort) existing_dirs=$(pct exec "$ctid" -- find /mnt -mindepth 1 -maxdepth 1 -type d 2>/dev/null | sort)
if [[ -z "$existing_dirs" ]]; then if [[ -z "$existing_dirs" ]]; then
dialog --msgbox "$(translate "No existing directories found in /mnt")" 8 60 whiptail --msgbox "$(translate "No existing directories found in /mnt")" 8 60
continue continue
fi fi
options=() mount_point=$(whiptail --title "$(translate "Select Existing Folder")" \
while IFS= read -r dir; do --menu "$(translate "Choose a folder from /mnt:")" 20 70 10 \
name=$(basename "$dir") $existing_dirs 3>&1 1>&2 2>&3) || continue
options+=("$dir" "$name")
done <<< "$existing_dirs"
mount_point=$(dialog --title "$(translate "Select Existing Folder in LXC")" \
--menu "\n$(translate "Choose a folder from /mnt:")" 20 70 10 "${options[@]}" 3>&1 1>&2 2>&3) || continue
;; ;;
3) 3)
mount_point=$(dialog --inputbox "$(translate "Enter full path:")" 10 70 "/mnt/shared" 3>&1 1>&2 2>&3) || continue mount_point=$(whiptail --inputbox "$(translate "Enter full path:")" 10 70 "/mnt/shared" 3>&1 1>&2 2>&3) || continue
[[ -z "$mount_point" ]] && continue [[ -z "$mount_point" ]] && continue
mount_point="/mnt/$mount_point"
pct exec "$ctid" -- mkdir -p "$mount_point" 2>/dev/null pct exec "$ctid" -- mkdir -p "$mount_point" 2>/dev/null
;; ;;
4) 4)
return 1 return 1
;; ;;
@@ -400,8 +424,6 @@ select_container_mount_point() {
# ========================================================== # ==========================================================
# CLIENT MOUNT FUNCTIONS (NFS/SAMBA COMMON) # CLIENT MOUNT FUNCTIONS (NFS/SAMBA COMMON)
# ========================================================== # ==========================================================