From 00faa4a7c545e0b882e7870212cf3ac920ad7b34 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 21 Mar 2023 08:38:34 -0400 Subject: [PATCH] improve --- ct/adguard.sh | 2 +- ct/casaos.sh | 2 +- ct/debian.sh | 2 +- ct/docker.sh | 2 +- ct/umbrel.sh | 2 +- misc/{alpine1.func => alpine-install.func} | 0 misc/{alpine2.func => alpine.func} | 0 misc/{debian1.func => debian.func} | 2 +- misc/{docker1.func => docker.func} | 2 +- misc/{debian2.func => install.func} | 0 misc/{docker2.func => ubuntu.func} | 0 misc/ubuntu1.func | 0 12 files changed, 7 insertions(+), 7 deletions(-) rename misc/{alpine1.func => alpine-install.func} (100%) rename misc/{alpine2.func => alpine.func} (100%) rename misc/{debian1.func => debian.func} (99%) rename misc/{docker1.func => docker.func} (99%) rename misc/{debian2.func => install.func} (100%) rename misc/{docker2.func => ubuntu.func} (100%) delete mode 100644 misc/ubuntu1.func diff --git a/ct/adguard.sh b/ct/adguard.sh index ae4b00d1..1e06dff0 100644 --- a/ct/adguard.sh +++ b/ct/adguard.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian1.func) +source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func) # Copyright (c) 2021-2023 tteck # Author: tteck (tteckster) # License: MIT diff --git a/ct/casaos.sh b/ct/casaos.sh index 3932d523..83ab46ed 100644 --- a/ct/casaos.sh +++ b/ct/casaos.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/docker1.func) +source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/docker.func) # Copyright (c) 2021-2023 tteck # Author: tteck (tteckster) # License: MIT diff --git a/ct/debian.sh b/ct/debian.sh index 957e8498..9fdac351 100644 --- a/ct/debian.sh +++ b/ct/debian.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian1.func) +source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func) # Copyright (c) 2021-2023 tteck # Author: tteck (tteckster) # License: MIT diff --git a/ct/docker.sh b/ct/docker.sh index 01687183..e35b9f1a 100644 --- a/ct/docker.sh +++ b/ct/docker.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/docker1.func) +source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/docker.func) # Copyright (c) 2021-2023 tteck # Author: tteck (tteckster) # License: MIT diff --git a/ct/umbrel.sh b/ct/umbrel.sh index 6b7174b3..38727fb3 100644 --- a/ct/umbrel.sh +++ b/ct/umbrel.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/docker1.func) +source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/docker.func) # Copyright (c) 2021-2023 tteck # Author: tteck (tteckster) # License: MIT diff --git a/misc/alpine1.func b/misc/alpine-install.func similarity index 100% rename from misc/alpine1.func rename to misc/alpine-install.func diff --git a/misc/alpine2.func b/misc/alpine.func similarity index 100% rename from misc/alpine2.func rename to misc/alpine.func diff --git a/misc/debian1.func b/misc/debian.func similarity index 99% rename from misc/debian1.func rename to misc/debian.func index d2431e56..e98f891f 100644 --- a/misc/debian1.func +++ b/misc/debian.func @@ -346,7 +346,7 @@ build_container() { fi TEMP_DIR=$(mktemp -d) pushd $TEMP_DIR >/dev/null - export FUNCTIONS_FILE_PATH=$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian2.func) + export FUNCTIONS_FILE_PATH=$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/install.func) export tz=$timezone export DISABLEIPV6=$DISABLEIP6 export APPLICATION=$APP diff --git a/misc/docker1.func b/misc/docker.func similarity index 99% rename from misc/docker1.func rename to misc/docker.func index 0309dae6..9174eb5f 100644 --- a/misc/docker1.func +++ b/misc/docker.func @@ -353,7 +353,7 @@ build_container() { fi TEMP_DIR=$(mktemp -d) pushd $TEMP_DIR >/dev/null - export FUNCTIONS_FILE_PATH=$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/docker2.func) + export FUNCTIONS_FILE_PATH=$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian2.func) export tz=$timezone export ST=$FUSE export DISABLEIPV6=$DISABLEIP6 diff --git a/misc/debian2.func b/misc/install.func similarity index 100% rename from misc/debian2.func rename to misc/install.func diff --git a/misc/docker2.func b/misc/ubuntu.func similarity index 100% rename from misc/docker2.func rename to misc/ubuntu.func diff --git a/misc/ubuntu1.func b/misc/ubuntu1.func deleted file mode 100644 index e69de29b..00000000