From 3e11c1fb0d2435a21db7a0e60584adf41b9cadc2 Mon Sep 17 00:00:00 2001 From: Sam Heinz <54530346+asylumexp@users.noreply.github.com> Date: Tue, 31 Dec 2024 15:29:43 +1000 Subject: [PATCH 1/2] Update build.func --- misc/build.func | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/misc/build.func b/misc/build.func index 93a8519e9..b032e6a56 100644 --- a/misc/build.func +++ b/misc/build.func @@ -1,8 +1,7 @@ # Copyright (c) 2021-2024 tteck # Author: tteck (tteckster) -# Co-Author: MickLesk # License: MIT -# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE +# https://github.com/asylumexp/Proxmox/raw/main/LICENSE variables() { NSAPP=$(echo ${APP,,} | tr -d ' ') # This function sets the NSAPP variable by converting the value of the APP variable to lowercase and removing any spaces. @@ -148,9 +147,9 @@ fi # This function checks the system architecture and exits if it's not "amd64". arch_check() { - if [ "$(dpkg --print-architecture)" != "amd64" ]; then - echo -e "\n ${INFO}${YWB}This script will not work with PiMox! \n" - echo -e "\n ${YWB}Visit https://github.com/asylumexp/Proxmox for ARM64 support. \n" + if [ "$(dpkg --print-architecture)" != "arm64" ]; then + echo -e "\n ${INFO}${YWB}This script will not work on non arm64 systems! \n" + echo -e "\n ${YWB}Visit https://github.com/asylumexp/Proxmox for AMD64 support. \n" echo -e "Exiting..." sleep 2 exit @@ -204,7 +203,7 @@ header_info() { return 1 fi temp_dir=$(mktemp -d) - curl -sL https://github.com/community-scripts/ProxmoxVE/raw/refs/heads/main/misc/figlet.tar.xz -o "$temp_dir/figlet.tar.xz" + curl -sL https://github.com/asylumexp/Proxmox/raw/refs/heads/main/misc/figlet.tar.xz -o "$temp_dir/figlet.tar.xz" mkdir -p /tmp/figlet tar -xf "$temp_dir/figlet.tar.xz" -C /tmp/figlet --strip-components=1 cd /tmp/figlet @@ -640,7 +639,6 @@ install_script() { pve_check shell_check root_check - arch_check ssh_check if systemctl is-active -q ping-instances.service; then @@ -769,9 +767,9 @@ build_container() { TEMP_DIR=$(mktemp -d) pushd $TEMP_DIR >/dev/null if [ "$var_os" == "alpine" ]; then - export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/alpine-install.func)" + export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/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/asylumexp/Proxmox/main/misc/install.func)" fi export CACHER="$APT_CACHER" export CACHER_IP="$APT_CACHER_IP" @@ -801,7 +799,7 @@ build_container() { $PW " # This executes create_lxc.sh and creates the container and .conf file - bash -c "$(wget -qLO - https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/create_lxc.sh)" || exit + bash -c "$(wget -qLO - https://raw.githubusercontent.com/asylumexp/Proxmox/main/ct/create_lxc.sh)" || exit LXC_CONFIG=/etc/pve/lxc/${CTID}.conf if [ "$CT_TYPE" == "0" ]; then @@ -863,7 +861,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/asylumexp/Proxmox/main/install/$var_install.sh)" || exit } @@ -874,8 +872,8 @@ description() { # Generate LXC Description DESCRIPTION=$(cat < - - Logo + + Logo

${APP} LXC

@@ -888,15 +886,15 @@ description() { - GitHub + GitHub - Discussions + Discussions - Issues + Issues EOF From 9ebb459acf06dbffd83690c4bb41901a89381586 Mon Sep 17 00:00:00 2001 From: Sam Heinz <54530346+asylumexp@users.noreply.github.com> Date: Tue, 31 Dec 2024 15:31:47 +1000 Subject: [PATCH 2/2] Update alpine-install.func --- misc/alpine-install.func | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/misc/alpine-install.func b/misc/alpine-install.func index e8244baa2..6d7afc90f 100644 --- a/misc/alpine-install.func +++ b/misc/alpine-install.func @@ -1,8 +1,7 @@ # Copyright (c) 2021-2024 tteck # Author: tteck (tteckster) -# Co-Author: MickLesk # License: MIT -# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE +# https://github.com/asylumexp/Proxmox/raw/main/LICENSE # This function sets color variables for formatting output in the terminal color() { @@ -150,7 +149,7 @@ motd_ssh() { 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}${GATEWAY}${YW} Provided by: ${GN}community-scripts ORG ${YW}| Project: ${GN}ProxmoxVE ${YW}| GitHub: ${GN}https://github.com/asylumexp/Proxmox${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" @@ -175,4 +174,4 @@ customize() { bash -c "passwd -d root" >/dev/null 2>&1 msg_ok "Customized Container" fi -} \ No newline at end of file +}