albert/Proxmox
1
0
Fork 0
mirror of https://github.com/tteck/Proxmox.git synced 2025-02-15 06:09:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

code refactoring (#1047)

Browse source
This commit is contained in:
tteckster 2023-02-12 06:05:07 -05:00 • committed by GitHub
parent 03ff3750bf
commit 8e98eb0617
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
82 changed files with 2760 additions and 2653 deletions
Download patch file Download diff file Expand all files Collapse all files

67
ct/docker-v5.sh
View file

@ -60,8 +60,8 @@ function msg_ok() {
}
function msg_error() {
local msg="$1"
echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
local msg="$1"
echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
}
function PVE_CHECK() {
@ -70,39 +70,17 @@ if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
echo -e "Requires PVE Version 7.0 or higher"
echo -e "Exiting..."
sleep 2
exit
exit
fi
}
function ARCH_CHECK() {
if [ "$(dpkg --print-architecture)" != "amd64" ]; then
echo -e "\n ${CROSS} This script will not work with PiMox! \n"
echo -e "Exiting..."
sleep 2
exit
fi
if [ "$(dpkg --print-architecture)" != "amd64" ]; then
echo -e "\n ${CROSS} This script will not work with PiMox! \n"
echo -e "Exiting..."
sleep 2
exit
fi
}
if command -v pveversion >/dev/null 2>&1; then
if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
NEXTID=$(pvesh get /cluster/nextid)
else
clear
echo -e "⚠ User exited script \n"
exit
fi
fi
if ! command -v pveversion >/dev/null 2>&1; then
if [[ ! -d /etc/docker ]]; then
msg_error "No ${APP} Installation Found!";
exit
fi
if (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC. Proceed?" 10 58); then
echo "User selected Yes"
else
clear
echo -e "⚠ User exited script \n"
exit
fi
fi
function default_settings() {
echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
@ -139,7 +117,7 @@ function default_settings() {
VLAN=""
echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
SSH="no"
echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}No${CL}"
echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}No${CL}"
FUSE="no"
echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
VERB="no"
@ -311,10 +289,10 @@ function advanced_settings() {
SSH="no"
fi
if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}Yes${CL}"
echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}Yes${CL}"
FUSE="yes"
else
echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}No${CL}"
echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}No${CL}"
FUSE="no"
fi
if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
@ -336,6 +314,7 @@ function advanced_settings() {
function install_script() {
ARCH_CHECK
PVE_CHECK
NEXTID=$(pvesh get /cluster/nextid)
header_info
if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
header_info
@ -355,7 +334,25 @@ apt-get -y upgrade &>/dev/null
msg_ok "Updated ${APP} LXC"
exit
}
if ! command -v pveversion >/dev/null 2>&1; then update_script; else install_script; fi
if command -v pveversion >/dev/null 2>&1; then
if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
clear
echo -e "⚠ User exited script \n"
exit
fi
install_script
fi
if ! command -v pveversion >/dev/null 2>&1; then
if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC. Proceed?" 10 58); then
clear
echo -e "⚠ User exited script \n"
exit
fi
update_script
fi
if [ "$VERB" == "yes" ]; then set -x; fi
if [ "$FUSE" == "yes" ]; then
FEATURES="fuse=1,keyctl=1,nesting=1"