Massive Update: build.func | install.func | create_lxc.sh (Part 1) (#643)

* Big Update: Build.func Install.Func Create_LXC

* Change Author

Co-authored-by: Håvard Gjøby Thom <[email protected]>

* Fix indentation / naming / echos

* Fix some Parts

* Add alpine-install.func

* update alpine to 3.20

* fix spaces

* Update build.func

* Merge Create_LXC from DEV

* Merge from DEV

* Merge from DEV

---------

Co-authored-by: Håvard Gjøby Thom <[email protected]>

Author: MickLesk

ct/alpine.sh

@@ -24,7 +24,7 @@ var_disk="0.1"
 var_cpu="1"
 var_ram="512"
 var_os="alpine"
-var_version="3.19"
+var_version="3.20"
 variables
 color
 catch_errors

ct/create_lxc.sh

@@ -2,22 +2,33 @@
 
 # Copyright (c) 2021-2024 tteck
 # Author: tteck (tteckster)
+# Co-Author: MickLesk
 # License: MIT
 # https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 
 # This sets verbose mode if the global variable is set to "yes"
 # if [ "$VERBOSE" == "yes" ]; then set -x; fi
 
 # This function sets color variables for formatting output in the terminal
+# Colors
 YW=$(echo "\033[33m")
+YWB=$(echo "\033[93m")
 BL=$(echo "\033[36m")
 RD=$(echo "\033[01;31m")
 GN=$(echo "\033[1;92m")
+
+# Formatting
 CL=$(echo "\033[m")
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
+UL=$(echo "\033[4m")
+BOLD=$(echo "\033[1m")
 BFR="\\r\\033[K"
 HOLD=" "
+TAB="  "
+
+# Icons
+CM="${TAB}✔️${TAB}${CL}"
+CROSS="${TAB}✖️${TAB}${CL}"
+INFO="${TAB}💡${TAB}${CL}"
 
 # This sets error handling options and defines the error_handler function to handle errors
 set -Eeuo pipefail
@@ -36,19 +47,24 @@ function error_handler() {
 
 # This function displays a spinner.
 function spinner() {
-    local chars="/-\|"
-    local spin_i=0
-    printf "\e[?25l"
-    while true; do
-        printf "\r \e[36m%s\e[0m" "${chars:spin_i++%${#chars}:1}"
-        sleep 0.1
-    done
+  local frames=('⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏')
+  local spin_i=0
+  local interval=0.1
+  printf "\e[?25l" 
+
+  local color="${YWB}"
+
+  while true; do
+    printf "\r ${color}%s${CL}" "${frames[spin_i]}"
+    spin_i=$(( (spin_i + 1) % ${#frames[@]} ))
+    sleep "$interval"
+  done
 }
 
 # This function displays an informational message with a yellow color.
 function msg_info() {
   local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}   "
+  echo -ne "${TAB}${YW}${HOLD}${msg}${HOLD}"
   spinner &
   SPINNER_PID=$!
 }
@@ -58,15 +74,15 @@ function msg_ok() {
   if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID > /dev/null; then kill $SPINNER_PID > /dev/null; fi
   printf "\e[?25h"
   local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
+  echo -e "${BFR}${CM}${GN}${msg}${CL}"
 }
 
 # This function displays a error message with a red color.
 function msg_error() {
   if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID > /dev/null; then kill $SPINNER_PID > /dev/null; fi
   printf "\e[?25h"
   local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
+  echo -e "${BFR}${CROSS}${RD}${msg}${CL}"
 }
 
 # This checks for the presence of valid Container Storage and Template Storage locations
@@ -105,7 +121,7 @@ function select_storage() {
     local TAG=$(echo $line | awk '{print $1}')
     local TYPE=$(echo $line | awk '{printf "%-10s", $2}')
     local FREE=$(echo $line | numfmt --field 4-6 --from-unit=K --to=iec --format %.2f | awk '{printf( "%9sB", $6)}')
-    local ITEM="  Type: $TYPE Free: $FREE "
+    local ITEM="Type: $TYPE Free: $FREE "
     local OFFSET=2
     if [[ $((${#ITEM} + $OFFSET)) -gt ${MSG_MAX_LENGTH:-} ]]; then
       local MSG_MAX_LENGTH=$((${#ITEM} + $OFFSET))
@@ -123,11 +139,14 @@ function select_storage() {
       "Which storage pool you would like to use for the ${CONTENT_LABEL,,}?\nTo make a selection, use the Spacebar.\n" \
       16 $(($MSG_MAX_LENGTH + 23)) 6 \
       "${MENU[@]}" 3>&1 1>&2 2>&3) || exit "Menu aborted."
+      if [ $? -ne 0 ]; then
+        echo -e "${CROSS}${RD} Menu aborted by user.${CL}"
+        exit 0 
+      fi
     done
-    printf $STORAGE
+    printf "%s" "$STORAGE"
   fi
 }
-
 # Test if required variables are set
 [[ "${CTID:-}" ]] || exit "You need to set 'CTID' variable."
 [[ "${PCT_OSTYPE:-}" ]] || exit "You need to set 'PCT_OSTYPE' variable."

misc/alpine-install.func

@@ -1,20 +1,42 @@
+# Copyright (c) 2021-2024 tteck
+# Author: tteck (tteckster)
+# Co-Author: MickLesk
+# License: MIT
+# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+
+# This function sets color variables for formatting output in the terminal
 color() {
+  # Colors
   YW=$(echo "\033[33m")
+  YWB=$(echo "\033[93m")
   BL=$(echo "\033[36m")
   RD=$(echo "\033[01;31m")
-  BGN=$(echo "\033[4;92m")
   GN=$(echo "\033[1;92m")
-  DGN=$(echo "\033[32m")
+
+  # Formatting
   CL=$(echo "\033[m")
+  BFR="\\r\\033[K"
+  BOLD=$(echo "\033[1m")
+  TAB="  "
+  
+  # System
   RETRY_NUM=10
   RETRY_EVERY=3
   i=$RETRY_NUM
-  CM="${GN}✓${CL}"
-  CROSS="${RD}✗${CL}"
-  BFR="\\r\\033[K"
-  HOLD="-"
+
+  # Icons
+  CM="${TAB}✔️${TAB}${CL}"
+  CROSS="${TAB}✖️${TAB}${CL}"
+  INFO="${TAB}💡${TAB}${CL}"
+  NETWORK="${TAB}📡${TAB}${CL}"
+  OS="${TAB}🖥️${TAB}${CL}"
+  OSVERSION="${TAB}🌟${TAB}${CL}"
+  HOSTNAME="${TAB}🏠${TAB}${CL}"
+  GATEWAY="${TAB}🌐${TAB}${CL}"
+  DEFAULT="${TAB}⚙️${TAB}${CL}"
 }
 
+# This function enables IPv6 if it's not disabled and sets verbose mode if the global variable is set to "yes"
 verb_ip6() {
   if [ "$VERBOSE" = "yes" ]; then
     STD=""
@@ -27,11 +49,13 @@ verb_ip6() {
   fi
 }
 
+# This function catches errors and handles them with the error handler function
 catch_errors() {
   set -Eeuo pipefail
   trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
 }
 
+# This function handles errors
 error_handler() {
   local exit_code="$?"
   local line_number="$1"
@@ -40,21 +64,25 @@ error_handler() {
   echo -e "\n$error_message\n"
 }
 
+# This function displays an informational message with a yellow color.
 msg_info() {
   local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
+  echo -ne " ${TAB}${YW}${msg}"
 }
 
+# This function displays a success message with a green color.
 msg_ok() {
   local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
+  echo -e "${BFR}${CM}${GN}${msg}${CL}"
 }
 
+# This function displays a error message with a red color.
 msg_error() {
   local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
+  echo -e "${BFR}${CROSS}${RD}${msg}${CL}"
 }
 
+# This function sets up the Container OS by generating the locale, setting the timezone, and checking the network connection
 setting_up_container() {
   msg_info "Setting up Container OS"
   while [ $i -gt 0 ]; do
@@ -68,23 +96,26 @@ setting_up_container() {
 
   if [ "$(ip addr show | grep 'inet ' | grep -v '127.0.0.1' | awk '{print $2}' | cut -d'/' -f1)" = "" ]; then
     echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
-    echo -e " 🖧  Check Network Settings"
+    echo -e "${NETWORK}Check Network Settings"
     exit 1
   fi
   msg_ok "Set up Container OS"
   msg_ok "Network Connected: ${BL}$(ip addr show | grep 'inet ' | awk '{print $2}' | cut -d'/' -f1 | tail -n1)${CL}"
 }
 
+# This function checks the network connection by pinging a known IP address and prompts the user to continue if the internet is not connected
 network_check() {
   set +e
   trap - ERR
-  if ping -c 1 -W 1 1.1.1.1 &>/dev/null; then msg_ok "Internet Connected"; else
+  if ping -c 1 -W 1 1.1.1.1 &>/dev/null || ping -c 1 -W 1 8.8.8.8 &>/dev/null || ping -c 1 -W 1 9.9.9.9 &>/dev/null; then 
+    msg_ok "Internet Connected"; 
+  else
     msg_error "Internet NOT Connected"
     read -r -p "Would you like to continue anyway? <y/N> " prompt
     if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-      echo -e " ⚠️  ${RD}Expect Issues Without Internet${CL}"
+      echo -e "${INFO}${RD}Expect Issues Without Internet${CL}"
     else
-      echo -e " 🖧  Check Network Settings"
+    echo -e "${NETWORK}Check Network Settings"
       exit 1
     fi
   fi
@@ -94,27 +125,54 @@ network_check() {
   trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
 }
 
+# This function updates the Container OS by running apt-get update and upgrade
 update_os() {
   msg_info "Updating Container OS"
   $STD apk update
   $STD apk upgrade
   msg_ok "Updated Container OS"
 }
 
+# This function modifies the message of the day (motd) and SSH settings
 motd_ssh() {
+  # Set terminal to 256-color mode
   echo "export TERM='xterm-256color'" >>/root/.bashrc
-  echo -e "$APPLICATION LXC provided by https://Helper-Scripts.com/\n" >/etc/motd
+  IP=$(ip -4 addr show eth0 | awk '/inet / {print $2}' | cut -d/ -f1 | head -n 1)
+  # Get OS information
+  if [ -f "/etc/os-release" ]; then
+    OS_NAME=$(grep ^NAME /etc/os-release | cut -d= -f2 | tr -d '"')
+    OS_VERSION=$(grep ^VERSION_ID /etc/os-release | cut -d= -f2 | tr -d '"')
+  else
+    OS_NAME="Alpine Linux"
+    OS_VERSION="Unknown"
+  fi
+  # Set MOTD with application info and system details
+  MOTD_FILE="/etc/motd"
+  if [ -f "$MOTD_FILE" ]; then
+    echo -e "\n${BOLD}${APPLICATION} LXC Container${CL}" > "$MOTD_FILE"
+    echo -e "${TAB}${GATEWAY}${YW} Provided by: ${GN}community-scripts ORG ${YW}| Project: ${GN}ProxmoxVE ${YW}| GitHub: ${GN}https://github.com/community-scripts/ProxmoxVE${CL}\n" >> "$MOTD_FILE"
+    echo -e "${TAB}${OS}${YW} OS: ${GN}${OS_NAME} ${OS_VERSION}${CL}" >> "$MOTD_FILE"
+    echo -e "${TAB}${HOSTNAME}${YW} Hostname: ${GN}$(hostname)${CL}" >> "$MOTD_FILE"
+    echo -e "${TAB}${INFO}${YW} IP Address: ${GN}${IP}${CL}" >> "$MOTD_FILE"
+  else
+    echo -e "${RD}[WARNING] MOTD file does not exist!${CL}" >&2
+  fi
+  # Configure SSH if enabled
   if [[ "${SSH_ROOT}" == "yes" ]]; then
+    # Enable sshd service
     $STD rc-update add sshd
+    # Allow root login via SSH
     sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config
+    # Start the sshd service
     $STD /etc/init.d/sshd start
   fi
 }
 
+# This function customizes the container and enables passwordless login for the root user
 customize() {
   if [[ "$PASSWORD" == "" ]]; then
   msg_info "Customizing Container"
   bash -c "passwd -d root" >/dev/null 2>&1
   msg_ok "Customized Container"
   fi
-}
+}