From 20c2bd9e3adab6ae1f428a37023f85803d1fc855 Mon Sep 17 00:00:00 2001 From: Sam Heinz <54530346+asylumexp@users.noreply.github.com> Date: Mon, 8 Apr 2024 12:24:56 +1000 Subject: [PATCH] Add files via upload --- ct/create_lxc.sh | 2 +- ct/radarr.sh | 2 +- install/radarr-install.sh | 3 ++- misc/build.func | 16 ++-------------- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/ct/create_lxc.sh b/ct/create_lxc.sh index 010dffb8b..ce6e7d137 100644 --- a/ct/create_lxc.sh +++ b/ct/create_lxc.sh @@ -178,6 +178,6 @@ PCT_OPTIONS=(${PCT_OPTIONS[@]:-${DEFAULT_PCT_OPTIONS[@]}}) # Create container msg_info "Creating LXC Container" -pct create $CTID ${TEMPLATE_STORAGE}:vztmpl/${TEMPLATE} ${PCT_OPTIONS[@]} >/dev/null || +pct create $CTID /var/lib/vz/template/cache/debian_12_arm64.tar.xz ${PCT_OPTIONS[@]} >/dev/null || exit "A problem occured while trying to create container." msg_ok "LXC Container ${BL}$CTID${CL} ${GN}was successfully created." diff --git a/ct/radarr.sh b/ct/radarr.sh index 69a75d628..1df77b85a 100644 --- a/ct/radarr.sh +++ b/ct/radarr.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) +source ./build.func # Copyright (c) 2021-2024 tteck # Author: tteck (tteckster) # License: MIT diff --git a/install/radarr-install.sh b/install/radarr-install.sh index 4839b90a4..cd8c2c5b0 100644 --- a/install/radarr-install.sh +++ b/install/radarr-install.sh @@ -18,12 +18,13 @@ $STD apt-get install -y curl $STD apt-get install -y sudo $STD apt-get install -y mc $STD apt-get install -y sqlite3 +$STD apt-get install -y wget msg_ok "Installed Dependencies" msg_info "Installing Radarr" mkdir -p /var/lib/radarr/ chmod 775 /var/lib/radarr/ -$STD wget --content-disposition 'https://radarr.servarr.com/v1/update/master/updatefile?os=linux&runtime=netcore&arch=x64' +$STD wget --content-disposition 'https://radarr.servarr.com/v1/update/master/updatefile?os=linux&runtime=netcore&arch=arm64' $STD tar -xvzf Radarr.master.*.tar.gz mv Radarr /opt chmod 775 /opt/Radarr diff --git a/misc/build.func b/misc/build.func index bac97de5d..bf0234b04 100644 --- a/misc/build.func +++ b/misc/build.func @@ -107,16 +107,6 @@ pve_check() { 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 ${CROSS} This script will not work with PiMox! \n" - echo -e "Exiting..." - sleep 2 - exit - fi -} - # This function checks if the script is running through SSH and prompts the user to confirm if they want to proceed or exit. ssh_check() { if command -v pveversion >/dev/null 2>&1 && [ -n "${SSH_CLIENT:+x}" ]; then @@ -463,7 +453,6 @@ install_script() { pve_check shell_check root_check - arch_check ssh_check if systemctl is-active -q ping-instances.service; then @@ -543,7 +532,6 @@ build_container() { -tags proxmox-helper-scripts $SD $NS - -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU -onboot 1 -cores $CORE_COUNT -memory $RAM_SIZE @@ -551,7 +539,7 @@ build_container() { $PW " # This executes create_lxc.sh and creates the container and .conf file - bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit + bash /root/create_lxc.sh || exit LXC_CONFIG=/etc/pve/lxc/${CTID}.conf if [ "$CT_TYPE" == "0" ]; then @@ -595,7 +583,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/tteck/Proxmox/main/install/$var_install.sh)" || exit + lxc-attach -n "$CTID" -- bash "/root/$var_install.sh" || exit }