diff --git a/ct/fladder.sh b/ct/fladder.sh index 5349f194c..3339da735 100644 --- a/ct/fladder.sh +++ b/ct/fladder.sh @@ -24,55 +24,49 @@ function update_script() { check_container_storage check_container_resources - if [[ ! -d /opt/fladder ]]; then + if [[ ! -f ~/.fladder ]]; then msg_error "No ${APP} Installation Found!" exit fi + # Get latest version from GitHub - RELEASE=$(curl -fsSL https://api.github.com/repos/DonutWare/Fladder/releases/latest | \ - grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}') + RELEASE=$(get_latest_github_release "DonutWare/Fladder") if [[ -z "$RELEASE" ]]; then msg_error "Failed to fetch latest release version from GitHub" exit 1 fi - if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then - msg_info "Stopping Service" - systemctl stop nginx - msg_ok "Stopped Service" - msg_info "Backing up configuration" - if [[ -f /opt/fladder/assets/config/config.json ]]; then - cp /opt/fladder/assets/config/config.json /tmp/fladder_config.json.bak - msg_ok "Configuration backed up" - elif [[ -f /opt/fladder/data/flutter_assets/config/config.json ]]; then - cp /opt/fladder/data/flutter_assets/config/config.json /tmp/fladder_config.json.bak - msg_ok "Configuration backed up" - fi + msg_info "Stopping Service" + systemctl stop nginx + msg_ok "Stopped Service" - msg_info "Updating ${APP} to ${RELEASE}" - cd /opt - wget -q "https://github.com/DonutWare/Fladder/releases/download/${RELEASE}/Fladder-Web-${RELEASE#v}.zip" - rm -rf /opt/fladder - unzip -q "Fladder-Web-${RELEASE#v}.zip" -d fladder - rm -f "Fladder-Web-${RELEASE#v}.zip" - echo "${RELEASE}" >/opt/${APP}_version.txt - msg_ok "Updated ${APP} to ${RELEASE}" - - msg_info "Restoring configuration" - if [[ -f /tmp/fladder_config.json.bak ]]; then - mkdir -p /opt/fladder/assets/config - cp /tmp/fladder_config.json.bak /opt/fladder/assets/config/config.json - rm -f /tmp/fladder_config.json.bak - msg_ok "Configuration restored" - fi - - msg_info "Starting Service" - systemctl start nginx - msg_ok "Started Service" - msg_ok "Updated successfully!" - else - msg_ok "No update required. ${APP} is already at ${RELEASE}" + msg_info "Backing up configuration" + if [[ -f /opt/fladder/assets/config/config.json ]]; then + cp /opt/fladder/assets/config/config.json /tmp/fladder_config.json.bak + msg_ok "Configuration backed up" fi + + msg_info "Updating ${APP} to ${RELEASE}" + cd /opt + wget -q "https://github.com/DonutWare/Fladder/releases/download/${RELEASE}/Fladder-Web-${RELEASE#v}.zip" + rm -rf /opt/fladder + unzip -q "Fladder-Web-${RELEASE#v}.zip" -d fladder + rm -f "Fladder-Web-${RELEASE#v}.zip" + echo "${RELEASE}" > ~/.fladder + msg_ok "Updated ${APP} to ${RELEASE}" + + msg_info "Restoring configuration" + if [[ -f /tmp/fladder_config.json.bak ]]; then + mkdir -p /opt/fladder/assets/config + cp /tmp/fladder_config.json.bak /opt/fladder/assets/config/config.json + rm -f /tmp/fladder_config.json.bak + msg_ok "Configuration restored" + fi + + msg_info "Starting Service" + systemctl start nginx + msg_ok "Started Service" + msg_ok "Updated successfully!" exit } diff --git a/frontend/public/json/fladder.json b/frontend/public/json/fladder.json index 99a8ffd81..9ee69b853 100644 --- a/frontend/public/json/fladder.json +++ b/frontend/public/json/fladder.json @@ -11,7 +11,7 @@ "interface_port": 80, "documentation": "https://github.com/DonutWare/Fladder/blob/develop/INSTALL.md#ubuntudebian", "website": "https://github.com/DonutWare/Fladder", - "logo": "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/webp/fladder.webp", + "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/fladder.webp", "config_path": "/opt/fladder/assets/config/config.json", "description": "Fladder is a simple Jellyfin frontend built on top of Flutter. It provides a modern interface to stream and sync content locally, manage libraries, support multiple profiles, and offers direct, transcode and offline playback with media segments skipping.", "install_methods": [ diff --git a/install/fladder-install.sh b/install/fladder-install.sh index 6146e0c7c..1514dbdab 100644 --- a/install/fladder-install.sh +++ b/install/fladder-install.sh @@ -14,22 +14,23 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ wget \ unzip \ nginx msg_ok "Installed Dependencies" msg_info "Installing ${APPLICATION}" + # Get latest version from GitHub -RELEASE=$(curl -fsSL https://api.github.com/repos/DonutWare/Fladder/releases/latest | \ - grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}') +RELEASE=$(get_latest_github_release "DonutWare/Fladder") + cd /opt $STD wget -q "https://github.com/DonutWare/Fladder/releases/download/${RELEASE}/Fladder-Web-${RELEASE#v}.zip" $STD unzip -o "Fladder-Web-${RELEASE#v}.zip" -d fladder rm -f "Fladder-Web-${RELEASE#v}.zip" -echo "${RELEASE}" >/opt/${APPLICATION}_version.txt +echo "${RELEASE}" > ~/.fladder msg_ok "Installed ${APPLICATION}" msg_info "Configuring Nginx"