Trez/docker-mods-uptime-kuma-timeout-fix
4
0
Fork 0
mirror of https://github.com/TrezOne/docker-mods-uptime-kuma-timeout-fix.git synced 2026-07-19 09:53:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make rm conditional on files existing, fix ver

Browse Source
This commit is contained in:
thespad
2024-06-08 21:27:03 +01:00
parent 7a2394b403
commit 390f2e8e7d
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-install.v1
+10 -7
View File
@@ -3,7 +3,7 @@
# Version 1 # Version 1
# 2024-03-26 - Initial Version # 2024-03-26 - Initial Version
PKG_SCRIPT_VER="3.20240326" PKG_SCRIPT_VER="1.20240608"
write_mod_info() { write_mod_info() {
local MSG=$* local MSG=$*
@@ -46,7 +46,7 @@ if [[ -f "/mod-repo-packages-to-install.list" ]]; then
IFS=' ' read -ra REPO_PACKAGES <<< "$(tr '\n' ' ' < /mod-repo-packages-to-install.list)" IFS=' ' read -ra REPO_PACKAGES <<< "$(tr '\n' ' ' < /mod-repo-packages-to-install.list)"
if [[ ${#REPO_PACKAGES[@]} -ne 0 ]] && [[ ${REPO_PACKAGES[*]} != "" ]]; then if [[ ${#REPO_PACKAGES[@]} -ne 0 ]] && [[ ${REPO_PACKAGES[*]} != "" ]]; then
write_mod_info "Installing all mod packages" write_mod_info "Installing all mod packages"
write_mod_debug "Defined packages: ${REPO_PACKAGES[@]}" write_mod_debug "Defined packages: ${REPO_PACKAGES[*]}"
if [[ -f /usr/bin/apt ]]; then if [[ -f /usr/bin/apt ]]; then
export DEBIAN_FRONTEND="noninteractive" export DEBIAN_FRONTEND="noninteractive"
apt-get update apt-get update
@@ -86,8 +86,8 @@ if [[ -f "/mod-pip-packages-to-install.list" ]]; then
ALPINE_VER=$(grep main /etc/apk/repositories | sed 's|.*alpine/v||' | sed 's|/main.*||') ALPINE_VER=$(grep main /etc/apk/repositories | sed 's|.*alpine/v||' | sed 's|/main.*||')
PIP_ARGS+=("-f" "https://wheel-index.linuxserver.io/alpine-${ALPINE_VER}/") PIP_ARGS+=("-f" "https://wheel-index.linuxserver.io/alpine-${ALPINE_VER}/")
fi fi
write_mod_debug "Installing defined pip packages: ${PIP_PACKAGES[@]}" write_mod_debug "Installing defined pip packages: ${PIP_PACKAGES[*]}"
write_mod_debug "Using pip args ${PIP_ARGS[@]}" write_mod_debug "Using pip args ${PIP_ARGS[*]}"
python3 -m pip install \ python3 -m pip install \
"${PIP_ARGS[@]}" \ "${PIP_ARGS[@]}" \
"${PIP_PACKAGES[@]}" "${PIP_PACKAGES[@]}"
@@ -95,6 +95,9 @@ if [[ -f "/mod-pip-packages-to-install.list" ]]; then
fi fi
write_mod_debug "Deleting temporary install lists for os and pip packages." write_mod_debug "Deleting temporary install lists for os and pip packages."
rm -rf \ if [[ -f "/mod-repo-packages-to-install.list" ]]; then
/mod-repo-packages-to-install.list \ rm -rf /mod-repo-packages-to-install.list
/mod-pip-packages-to-install.list fi
if [[ -f "/mod-pip-packages-to-install.list" ]]; then
rm -rf /mod-pip-packages-to-install.list
fi