From 60f1a6bda2bdf291377114d7e1262d1b693e8c6e Mon Sep 17 00:00:00 2001 From: Gerhard Burger Date: Sat, 23 Nov 2024 15:20:25 +0100 Subject: [PATCH] Temporary override of community-scripts url --- ct/outline.sh | 2 +- misc/build.func | 12 ++++++------ misc/install.func | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ct/outline.sh b/ct/outline.sh index e0aa9fa7..aacff200 100644 --- a/ct/outline.sh +++ b/ct/outline.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func) +source <(curl -s https://raw.githubusercontent.com/burgerga/ProxmoxVE/add_outline/misc/build.func) # Copyright (c) 2024 community-scripts ORG # Author: Gerhard Burger (burgerga) # License: MIT diff --git a/misc/build.func b/misc/build.func index aee3366a..a3e16368 100644 --- a/misc/build.func +++ b/misc/build.func @@ -505,13 +505,13 @@ install_script() { check_container_resources() { # Check actual RAM & Cores current_ram=$(free -m | awk '/^Mem:/{print $2}') - current_cpu=$(nproc) + current_cpu=$(nproc) # Check whether the current RAM is less than the required RAM or the CPU cores are less than required if [[ "$current_ram" -lt "$var_ram" ]] || [[ "$current_cpu" -lt "$var_cpu" ]]; then echo -e "\n⚠️${HOLD} ${GN}Required: ${var_cpu} CPU, ${var_ram}MB RAM ${CL}| ${RD}Current: ${current_cpu} CPU, ${current_ram}MB RAM${CL}" echo -e "${YWB}Please ensure that the ${APP} LXC is configured with at least ${var_cpu} vCPU and ${var_ram} MB RAM for the build process.${CL}\n" - exit 1 + exit 1 else echo -e "" fi @@ -525,7 +525,7 @@ check_container_storage() { if (( usage > 80 )); then # Prompt the user for confirmation to continue echo -e "⚠️${HOLD} ${YWB}Warning: Storage is dangerously low (${usage}%).${CL}" - read -r -p "Continue anyway? " prompt + read -r -p "Continue anyway? " prompt # Check if the input is 'y' or 'yes', otherwise exit with status 1 if [[ ! ${prompt,,} =~ ^(y|yes)$ ]]; then echo -e "❌${HOLD} ${YWB}Exiting based on user input.${CL}" @@ -572,7 +572,7 @@ build_container() { if [ "$var_os" == "alpine" ]; then export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/alpine-install.func)" else - export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/install.func)" + export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/burgerga/ProxmoxVE/add_outline/misc/install.func)" fi export CACHER="$APT_CACHER" export CACHER_IP="$APT_CACHER_IP" @@ -666,7 +666,7 @@ http://dl-cdn.alpinelinux.org/alpine/latest-stable/community EOF' pct exec "$CTID" -- ash -c "apk add bash >/dev/null" fi - lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/$var_install.sh)" || exit + lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/burgerga/ProxmoxVE/add_outline/install/$var_install.sh)" || exit } @@ -688,7 +688,7 @@ description() { spend Coffee

- + GitHub diff --git a/misc/install.func b/misc/install.func index 2a22e2ff..79dbfe28 100644 --- a/misc/install.func +++ b/misc/install.func @@ -119,7 +119,7 @@ network_check() { ipv6_connected=false sleep 1 # Check IPv4 connectivity - if ping -c 1 -W 1 1.1.1.1 &>/dev/null; then + if ping -c 1 -W 1 1.1.1.1 &>/dev/null; then msg_ok "IPv4 Internet Connected"; ipv4_connected=true else @@ -198,6 +198,6 @@ EOF systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') msg_ok "Customized Container" fi - echo "bash -c \"\$(wget -qLO - https://github.com/community-scripts/ProxmoxVE/raw/main/ct/${app}.sh)\"" >/usr/bin/update + echo "bash -c \"\$(wget -qLO - https://github.com/burgerga/ProxmoxVE/raw/add_outline/ct/${app}.sh)\"" >/usr/bin/update chmod +x /usr/bin/update }