update
This commit is contained in:
+12
-28
@@ -7,6 +7,7 @@ source /opt/idssys/defaults/default.inc
|
||||
source /opt/idssys/ta-proxmenu/defaults.inc
|
||||
source /opt/idssys/ta-proxmenu/inc/git-update.inc
|
||||
source /opt/idssys/ta-proxmenu/inc/deploy-iso-nfs-lxc.sh
|
||||
source /opt/idssys/ta-proxmenu/inc/virtio-helpers.inc
|
||||
|
||||
ACTION_REQUESTED=0
|
||||
[[ -n "${action:-}" ]] && ACTION_REQUESTED=1
|
||||
@@ -791,29 +792,6 @@ declare -a VIRTIO_STORAGE_IDS=()
|
||||
declare -a VIRTIO_STORAGE_TYPES=()
|
||||
declare -a VIRTIO_STORAGE_DIRS=()
|
||||
|
||||
TAPM_VIRTIO_FILENAME_FROM_URL() {
|
||||
local url="${1%%\?*}"
|
||||
local filename="${url##*/}"
|
||||
|
||||
[[ "$filename" =~ ^virtio-win(-0\.1\.[0-9]+)?\.iso$ ]] || return 1
|
||||
printf '%s\n' "$filename"
|
||||
}
|
||||
|
||||
TAPM_VIRTIO_LABELED_FILENAME() {
|
||||
local source_filename="$1"
|
||||
local label="$2"
|
||||
local version=''
|
||||
|
||||
[[ "$label" =~ ^[a-z0-9-]+$ ]] || return 1
|
||||
if [[ "$source_filename" =~ ^virtio-win-(0\.1\.[0-9]+)\.iso$ ]]; then
|
||||
version="${BASH_REMATCH[1]}"
|
||||
elif [[ "$source_filename" != 'virtio-win.iso' ]]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
printf 'virtio-win-%s%s.iso\n' "$label" "${version:+-${version}}"
|
||||
}
|
||||
|
||||
TAPM_REFRESH_ISO_STORAGES() {
|
||||
local storage
|
||||
local type
|
||||
@@ -1398,7 +1376,7 @@ RESTART_SERVICE_GROUP() {
|
||||
choice="y"
|
||||
else
|
||||
echo -en "${idsCL[LightCyan]}Restart ${description} on this host (Y/n)?${idsCL[Default]} "
|
||||
read -n 1 choice
|
||||
read -r -n 1 choice
|
||||
echo
|
||||
fi
|
||||
[[ "$choice" =~ ^[Nn]$ ]] && return
|
||||
@@ -1443,7 +1421,7 @@ RESTART_CLUSTER_FILESYSTEM() {
|
||||
fi
|
||||
|
||||
echo -en "\n${idsCL[LightCyan]}Restart pve-cluster on this host (y/N)?${idsCL[Default]} "
|
||||
read -n 1 choice
|
||||
read -r -n 1 choice
|
||||
echo
|
||||
[[ "$choice" =~ ^[Yy]$ ]] || return
|
||||
|
||||
@@ -2019,7 +1997,7 @@ SWITCH_SCRIPT_BRANCH() {
|
||||
fi
|
||||
|
||||
echo -en "\n${idsCL[LightCyan]}Switch TA-ProxMenu from '${current_branch}' to '${target_branch}' (y/N)?${idsCL[Default]} "
|
||||
read -n 1 choice
|
||||
read -r -n 1 choice
|
||||
echo
|
||||
[[ "$choice" =~ ^[Yy]$ ]] || return
|
||||
|
||||
@@ -2181,7 +2159,7 @@ UTILITIES_MENU() {
|
||||
continue
|
||||
fi
|
||||
echo -en "\n${idsCL[LightCyan]}Install the update for the current branch (y/N)?${idsCL[Default]} "
|
||||
read -n 1 choice
|
||||
read -r -n 1 choice
|
||||
echo
|
||||
if [[ "$choice" =~ ^[Yy]$ ]] &&
|
||||
/opt/idssys/ta-proxmenu/run.sh update; then
|
||||
@@ -2229,7 +2207,13 @@ if (( ACTION_REQUESTED == 1 )); then
|
||||
glances) INSTALL_GLANCES;;
|
||||
acronis) INSTALL_ACRONIS;;
|
||||
post-install|post_install) PROXMENUX_POST_INSTALL;;
|
||||
proxmenux) [ ! -f /usr/local/bin/menu ] && INSTALL_PROXMENUX || /usr/local/bin/menu;;
|
||||
proxmenux)
|
||||
if [[ ! -f /usr/local/bin/menu ]]; then
|
||||
INSTALL_PROXMENUX
|
||||
else
|
||||
/usr/local/bin/menu
|
||||
fi
|
||||
;;
|
||||
virtio) VIRTIO_MENU;;
|
||||
sentinelone|s1) INSTALL_S1;;
|
||||
screenconnect) INSTALL_SCREENCONNECT;;
|
||||
|
||||
Reference in New Issue
Block a user