From 8dd3861a96e3161e4219cbd0859b9d49681375e1 Mon Sep 17 00:00:00 2001 From: Sam Heinz <54530346+asylumexp@users.noreply.github.com> Date: Tue, 22 Oct 2024 16:32:46 +1000 Subject: [PATCH] Port new scripts to arm64 --- ct/archivebox.sh | 2 +- ct/cockpit.sh | 2 +- ct/evcc.sh | 2 +- ct/homebox.sh | 2 +- ct/mysql.sh | 130 +++++++++++++++++----------------- ct/neo4j.sh | 2 +- ct/tianji.sh | 2 +- ct/zipline.sh | 2 +- install/archivebox-install.sh | 4 +- install/cockpit-install.sh | 2 + install/evcc-install.sh | 4 +- install/homebox-install.sh | 6 +- install/mysql-install.sh | 4 +- install/neo4j-install.sh | 2 + install/tianji-install.sh | 4 +- install/zipline-install.sh | 4 +- misc/build.func | 2 +- 17 files changed, 97 insertions(+), 79 deletions(-) diff --git a/ct/archivebox.sh b/ct/archivebox.sh index 9b058660c..cc9542bf6 100644 --- a/ct/archivebox.sh +++ b/ct/archivebox.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) +source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/build.func) # Copyright (c) 2021-2024 tteck # Author: tteck # License: MIT diff --git a/ct/cockpit.sh b/ct/cockpit.sh index 479229950..d6ac3c731 100644 --- a/ct/cockpit.sh +++ b/ct/cockpit.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) +source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/build.func) # Copyright (c) 2021-2024 tteck # Author: tteck # Co-Author: havardthom diff --git a/ct/evcc.sh b/ct/evcc.sh index c0e8ed617..d7aa048ee 100644 --- a/ct/evcc.sh +++ b/ct/evcc.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) +source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/build.func) # Copyright (c) 2021-2024 tteck # Author: MickLesk (Canbiz) # License: MIT diff --git a/ct/homebox.sh b/ct/homebox.sh index 5038f7820..65dcffc35 100644 --- a/ct/homebox.sh +++ b/ct/homebox.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) +source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/build.func) # Copyright (c) 2021-2024 tteck # Author: tteck # Co-Author: MickLesk (Canbiz) diff --git a/ct/mysql.sh b/ct/mysql.sh index 321d01f78..17fe996b2 100644 --- a/ct/mysql.sh +++ b/ct/mysql.sh @@ -1,70 +1,72 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) -# Copyright (c) 2021-2024 tteck -# Author: tteck -# Co-Author: MickLesk (Canbiz) -# License: MIT -# https://github.com/tteck/Proxmox/raw/main/LICENSE +# source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/build.func) +# # Copyright (c) 2021-2024 tteck +# # Author: tteck +# # Co-Author: MickLesk (Canbiz) +# # License: MIT +# # https://github.com/tteck/Proxmox/raw/main/LICENSE -function header_info { -clear -cat <<"EOF" - __ ___ _____ ____ __ - / |/ /_ __/ ___// __ \ / / - / /|_/ / / / /\__ \/ / / / / / - / / / / /_/ /___/ / /_/ / / /___ -/_/ /_/\__, //____/\___\_\/_____/ - /____/ -EOF -} -header_info -echo -e "Loading..." -APP="MySQL" -var_disk="4" -var_cpu="1" -var_ram="1024" -var_os="debian" -var_version="12" -variables -color -catch_errors +echo "Unsupported." -function default_settings() { - CT_TYPE="1" - PW="" - CT_ID=$NEXTID - HN=$NSAPP - DISK_SIZE="$var_disk" - CORE_COUNT="$var_cpu" - RAM_SIZE="$var_ram" - BRG="vmbr0" - NET="dhcp" - GATE="" - APT_CACHER="" - APT_CACHER_IP="" - DISABLEIP6="no" - MTU="" - SD="" - NS="" - MAC="" - VLAN="" - SSH="no" - VERB="no" - echo_default -} +# function header_info { +# clear +# cat <<"EOF" +# __ ___ _____ ____ __ +# / |/ /_ __/ ___// __ \ / / +# / /|_/ / / / /\__ \/ / / / / / +# / / / / /_/ /___/ / /_/ / / /___ +# /_/ /_/\__, //____/\___\_\/_____/ +# /____/ +# EOF +# } +# header_info +# echo -e "Loading..." +# APP="MySQL" +# var_disk="4" +# var_cpu="1" +# var_ram="1024" +# var_os="debian" +# var_version="12" +# variables +# color +# catch_errors -function update_script() { -header_info -if [[ ! -f /usr/share/keyrings/mysql.gpg ]]; then msg_error "No ${APP} Installation Found!"; exit; fi -msg_info "Updating ${APP} LXC" -apt-get update &>/dev/null -apt-get -y upgrade &>/dev/null -msg_ok "Updated Successfully" -exit -} +# function default_settings() { +# CT_TYPE="1" +# PW="" +# CT_ID=$NEXTID +# HN=$NSAPP +# DISK_SIZE="$var_disk" +# CORE_COUNT="$var_cpu" +# RAM_SIZE="$var_ram" +# BRG="vmbr0" +# NET="dhcp" +# GATE="" +# APT_CACHER="" +# APT_CACHER_IP="" +# DISABLEIP6="no" +# MTU="" +# SD="" +# NS="" +# MAC="" +# VLAN="" +# SSH="no" +# VERB="no" +# echo_default +# } -start -build_container -description +# function update_script() { +# header_info +# if [[ ! -f /usr/share/keyrings/mysql.gpg ]]; then msg_error "No ${APP} Installation Found!"; exit; fi +# msg_info "Updating ${APP} LXC" +# apt-get update &>/dev/null +# apt-get -y upgrade &>/dev/null +# msg_ok "Updated Successfully" +# exit +# } -msg_ok "Completed Successfully!\n" +# start +# build_container +# description + +# msg_ok "Completed Successfully!\n" diff --git a/ct/neo4j.sh b/ct/neo4j.sh index 123625d57..39f9cc2d4 100644 --- a/ct/neo4j.sh +++ b/ct/neo4j.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) +source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/build.func) # Copyright (c) 2021-2024 tteck # Author: tteck # Co-Author: havardthom diff --git a/ct/tianji.sh b/ct/tianji.sh index 6ff10f9cf..6e7889533 100644 --- a/ct/tianji.sh +++ b/ct/tianji.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) +source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/build.func) # Copyright (c) 2021-2024 tteck # Author: tteck # Co-Author: MickLesk (Canbiz) diff --git a/ct/zipline.sh b/ct/zipline.sh index 095cdbc7c..308b94505 100644 --- a/ct/zipline.sh +++ b/ct/zipline.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) +source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/build.func) # Copyright (c) 2021-2024 tteck # Author: tteck # Co-Author: MickLesk (Canbiz) diff --git a/install/archivebox-install.sh b/install/archivebox-install.sh index df9e0967e..8a88806af 100644 --- a/install/archivebox-install.sh +++ b/install/archivebox-install.sh @@ -25,7 +25,9 @@ $STD apt-get install -y \ libsasl2-dev \ procps \ dnsutils \ - ripgrep + ripgrep \ + wget \ + openssh-server msg_ok "Installed Dependencies" msg_info "Installing Python Dependencies" diff --git a/install/cockpit-install.sh b/install/cockpit-install.sh index adc328a48..5dc1de235 100644 --- a/install/cockpit-install.sh +++ b/install/cockpit-install.sh @@ -19,6 +19,8 @@ msg_info "Installing Dependencies" $STD apt-get install -y curl $STD apt-get install -y sudo $STD apt-get install -y mc +$STD apt-get install -y wget +$STD apt-get install -y openssh-server msg_ok "Installed Dependencies" msg_info "Installing Cockpit" diff --git a/install/evcc-install.sh b/install/evcc-install.sh index bd544ea5f..0040dc959 100644 --- a/install/evcc-install.sh +++ b/install/evcc-install.sh @@ -21,7 +21,9 @@ $STD apt-get install -y \ sudo \ mc \ lsb-release \ - gpg + gpg \ + wget \ + openssh-server msg_ok "Installed Dependencies" msg_info "Setting up evcc Repository" diff --git a/install/homebox-install.sh b/install/homebox-install.sh index 43969234b..56ea7ac69 100644 --- a/install/homebox-install.sh +++ b/install/homebox-install.sh @@ -19,12 +19,14 @@ msg_info "Installing Dependencies" $STD apt-get install -y \ curl \ sudo \ - mc + mc \ + wget \ + openssh-server msg_ok "Installed Dependencies" msg_info "Installing Homebox" RELEASE=$(curl -s https://api.github.com/repos/sysadminsmedia/homebox/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') -wget -qO- https://github.com/sysadminsmedia/homebox/releases/download/${RELEASE}/homebox_Linux_x86_64.tar.gz | tar -xzf - -C /opt +wget -qO- https://github.com/sysadminsmedia/homebox/releases/download/${RELEASE}/homebox_Linux_arm64.tar.gz | tar -xzf - -C /opt chmod +x /opt/homebox echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt" msg_ok "Installed Homebox" diff --git a/install/mysql-install.sh b/install/mysql-install.sh index 0a46b9278..27fdc8d28 100644 --- a/install/mysql-install.sh +++ b/install/mysql-install.sh @@ -21,7 +21,9 @@ $STD apt-get install -y \ lsb-release \ curl \ gnupg \ - mc + mc \ + wget \ + openssh-server msg_ok "Installed Dependencies" msg_info "Installing MySQL" diff --git a/install/neo4j-install.sh b/install/neo4j-install.sh index f5e8b8675..762f93e73 100644 --- a/install/neo4j-install.sh +++ b/install/neo4j-install.sh @@ -19,6 +19,8 @@ $STD apt-get install -y curl $STD apt-get install -y sudo $STD apt-get install -y mc $STD apt-get install -y gpg +$STD apt-get install -y wget +$STD apt-get install -y openssh-server msg_ok "Installed Dependencies" msg_info "Installing Neo4j (patience)" diff --git a/install/tianji-install.sh b/install/tianji-install.sh index 3d476444f..950c9679d 100644 --- a/install/tianji-install.sh +++ b/install/tianji-install.sh @@ -28,7 +28,9 @@ $STD apt-get install -y \ make \ gnupg \ ca-certificates \ - mc + mc \ + wget \ + openssh-server msg_ok "Installed Dependencies" msg_info "Installing Node.js" diff --git a/install/zipline-install.sh b/install/zipline-install.sh index 2c47d0351..0cee201e5 100644 --- a/install/zipline-install.sh +++ b/install/zipline-install.sh @@ -21,7 +21,9 @@ $STD apt-get install -y \ gpg \ curl \ sudo \ - mc + mc \ + wget \ + openssh-server msg_ok "Installed Dependencies" msg_info "Setting up Node.js Repository" diff --git a/misc/build.func b/misc/build.func index dfb68c410..318e9800e 100644 --- a/misc/build.func +++ b/misc/build.func @@ -491,7 +491,7 @@ install_script() { start() { if command -v pveversion >/dev/null 2>&1; then - if ! (whiptail --backtitle "Proxmox VE Helper Scripts" --title "${APP} LXC" --yesno "To ensure the safety of your system, please use ONLY https://tteck.github.io/Proxmox/\n\nThis will create a New ${APP} LXC. Proceed?" 10 90); then + if ! (whiptail --backtitle "Proxmox VE Helper Scripts" --title "${APP} LXC" --yesno "To ensure the safety of your system, please use ONLY https://tteck.github.io/Proxmox/ or https://pimox_scripts.com\n\nThis will create a New ${APP} LXC. Proceed?" 10 90); then clear echo -e "⚠ User exited script \n" exit