From 6996111473ea7c1ae03d413d81dceab96c269258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?= <58952836+tremor021@users.noreply.github.com> Date: Mon, 7 Jul 2025 11:00:19 +0200 Subject: [PATCH] Refactor: Baby Buddy (#5769) * Refactor * Update babybuddy.sh --- ct/babybuddy.sh | 12 +++--------- install/babybuddy-install.sh | 8 ++------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ct/babybuddy.sh b/ct/babybuddy.sh index 741dbc84f..2b34ade96 100644 --- a/ct/babybuddy.sh +++ b/ct/babybuddy.sh @@ -29,7 +29,7 @@ function update_script() { fi RELEASE=$(curl -fsSL https://api.github.com/repos/babybuddy/babybuddy/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') - if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/babybuddy_version.txt)" ]]; then + if [[ "${RELEASE}" != "$(cat ~/.babybuddy 2>/dev/null)" ]] || [[ ! -f ~/.babybuddy ]]; then setup_uv msg_info "Stopping Services" @@ -42,17 +42,14 @@ function update_script() { find . -mindepth 1 -maxdepth 1 ! -name '.venv' -exec rm -rf {} + msg_ok "Cleaned old files" + fetch_and_deploy_gh_release "babybuddy" "babybuddy/babybuddy" + msg_info "Updating ${APP} to v${RELEASE}" - temp_file=$(mktemp) - curl -fsSL "https://github.com/babybuddy/babybuddy/archive/refs/tags/v${RELEASE}.tar.gz" -o "$temp_file" cd /opt/babybuddy - tar zxf "$temp_file" --strip-components=1 -C /opt/babybuddy mv /tmp/production.py.bak babybuddy/settings/production.py - cd /opt/babybuddy source .venv/bin/activate $STD uv pip install -r requirements.txt $STD python manage.py migrate - echo "${RELEASE}" >/opt/${APP}_version.txt msg_ok "Updated ${APP} to v${RELEASE}" msg_info "Fixing permissions" @@ -66,9 +63,6 @@ function update_script() { systemctl start nginx msg_ok "Services Started" - msg_info "Cleaning up" - rm -f "$temp_file" - msg_ok "Cleaned" msg_ok "Updated Successfully" else msg_ok "No update required. ${APP} is already at v${RELEASE}" diff --git a/install/babybuddy-install.sh b/install/babybuddy-install.sh index 424edaa11..16b6e72d4 100644 --- a/install/babybuddy-install.sh +++ b/install/babybuddy-install.sh @@ -24,13 +24,10 @@ $STD apt-get install -y \ msg_ok "Installed Dependencies" setup_uv +fetch_and_deploy_gh_release "babybuddy" "babybuddy/babybuddy" msg_info "Installing Babybuddy" -RELEASE=$(curl -fsSL https://api.github.com/repos/babybuddy/babybuddy/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') -temp_file=$(mktemp) -mkdir -p /opt/{babybuddy,data} -curl -fsSL "https://github.com/babybuddy/babybuddy/archive/refs/tags/v${RELEASE}.tar.gz" -o "$temp_file" -tar zxf "$temp_file" --strip-components=1 -C /opt/babybuddy +mkdir -p /opt/data cd /opt/babybuddy $STD uv venv .venv $STD source .venv/bin/activate @@ -102,7 +99,6 @@ motd_ssh customize msg_info "Cleaning up" -rm -f "$temp_file" $STD apt-get -y autoremove $STD apt-get -y autoclean msg_ok "Cleaned"