From 037332465397caa9977578fe7e28b6d10089c76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?= <58952836+tremor021@users.noreply.github.com> Date: Tue, 22 Apr 2025 11:51:50 +0200 Subject: [PATCH] FIx a bug in update procedure and general code maintenance (#3974) --- ct/wger.sh | 79 ++++++++++++++++++++--------------------- install/wger-install.sh | 8 ++--- 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/ct/wger.sh b/ct/wger.sh index 79476274c..cd0e4d267 100644 --- a/ct/wger.sh +++ b/ct/wger.sh @@ -20,46 +20,45 @@ color catch_errors function update_script() { - header_info - check_container_storage - check_container_resources - if [[ ! -d /home/wger ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi - RELEASE=$(curl -fsSL https://api.github.com/repos/wger-project/wger/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}') - if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then - msg_info "Stopping $APP" - systemctl stop wger - msg_ok "Stopped $APP" - - msg_info "Updating $APP to v${RELEASE}" - temp_file=$(mktemp) - cd $temp_file -curl -fsSL "https://github.com/wger-project/wger/archive/refs/tags/$RELEASE.tar.gz" -o "$temp_file" - tar xzf $temp_file - cp -rf wger-$RELEASE/* /home/wger/src - cd /home/wger/src - python3 manage.py migrate &>/dev/null - yarn install &>/dev/null - yarn build:css:sass &>/dev/null - python3 manage.py collectstatic --noinput &>/dev/null - echo "${RELEASE}" >/opt/${APP}_version.txt - msg_ok "Updated $APP to v${RELEASE}" - - msg_info "Starting $APP" - systemctl start wger - msg_ok "Started $APP" - - msg_info "Cleaning Up" - rm -rf $temp_file - msg_ok "Cleanup Completed" - - msg_ok "Update Successful" - else - msg_ok "No update required. ${APP} is already at v${RELEASE}" - fi + header_info + check_container_storage + check_container_resources + if [[ ! -d /home/wger ]]; then + msg_error "No ${APP} Installation Found!" exit + fi + RELEASE=$(curl -fsSL https://api.github.com/repos/wger-project/wger/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}') + if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then + msg_info "Stopping $APP" + systemctl stop wger + msg_ok "Stopped $APP" + + msg_info "Updating $APP to v${RELEASE}" + temp_file=$(mktemp) + curl -fsSL "https://github.com/wger-project/wger/archive/refs/tags/$RELEASE.tar.gz" -o "$temp_file" + tar xzf "$temp_file" + cp -rf wger-"$RELEASE"/* /home/wger/src + cd /home/wger/src + python3 manage.py migrate &>/dev/null + yarn install &>/dev/null + yarn build:css:sass &>/dev/null + python3 manage.py collectstatic --noinput &>/dev/null + echo "${RELEASE}" >/opt/${APP}_version.txt + msg_ok "Updated $APP to v${RELEASE}" + + msg_info "Starting $APP" + systemctl start wger + msg_ok "Started $APP" + + msg_info "Cleaning Up" + rm -rf "$temp_file" + msg_ok "Cleanup Completed" + + msg_ok "Update Successful" + else + msg_ok "No update required. ${APP} is already at v${RELEASE}" + fi + exit } start @@ -69,4 +68,4 @@ description msg_ok "Completed Successfully!\n" echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" echo -e "${INFO}${YW} Access it using the following URL:${CL}" -echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}" \ No newline at end of file +echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}" diff --git a/install/wger-install.sh b/install/wger-install.sh index 0f5560762..fe0f6c690 100644 --- a/install/wger-install.sh +++ b/install/wger-install.sh @@ -15,10 +15,10 @@ update_os msg_info "Installing Dependencies" $STD apt-get install -y \ - git \ - gnupg \ - apache2 \ - libapache2-mod-wsgi-py3 + git \ + gnupg \ + apache2 \ + libapache2-mod-wsgi-py3 msg_ok "Installed Dependencies" msg_info "Installing Python"