From 2bb0ef04909d23a57cd47d178a9bd5f41e9fca12 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, 1 Apr 2025 20:21:54 +0200 Subject: [PATCH] Fix update dependencies (#3577) --- ct/fileflows.sh | 16 ++++++++++------ install/fileflows-install.sh | 9 +++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ct/fileflows.sh b/ct/fileflows.sh index aad3f73fb..a58207f5c 100644 --- a/ct/fileflows.sh +++ b/ct/fileflows.sh @@ -28,6 +28,10 @@ function update_script() { msg_error "No ${APP} Installation Found!" exit fi + if ! [[ $(dpkg -s jq 2>/dev/null) ]]; then + $STD apt-get update + $STD apt-get install -y jq + fi update_available=$(curl -fsSL -X 'GET' "http://localhost:19200/api/status/update-available" -H 'accept: application/json' | jq .UpdateAvailable) if [[ "${update_available}" == "true" ]]; then @@ -37,13 +41,13 @@ function update_script() { msg_info "Creating Backup" backup_filename="/opt/${APP}_backup_$(date +%F).tar.gz" - tar -czf $backup_filename -C /opt/fileflows Data + tar -czf "$backup_filename" -C /opt/fileflows Data msg_ok "Backup Created" msg_info "Updating $APP to latest version" temp_file=$(mktemp) - curl -fsSL https://fileflows.com/downloads/zip -o $temp_file - unzip -oq -d /opt/fileflows $temp_file + curl -fsSL https://fileflows.com/downloads/zip -o "$temp_file" + unzip -oq -d /opt/fileflows "$temp_file" msg_ok "Updated $APP to latest version" msg_info "Starting $APP" @@ -51,8 +55,8 @@ function update_script() { msg_ok "Started $APP" msg_info "Cleaning Up" - rm -rf $temp_file - rm -rf $backup_filename + rm -rf "$temp_file" + rm -rf "$backup_filename" msg_ok "Cleanup Completed" msg_ok "Update Successful" @@ -70,4 +74,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}:19200${CL}" \ No newline at end of file +echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:19200${CL}" diff --git a/install/fileflows-install.sh b/install/fileflows-install.sh index 477635ea8..612b8d67b 100644 --- a/install/fileflows-install.sh +++ b/install/fileflows-install.sh @@ -16,7 +16,8 @@ update_os msg_info "Installing Dependencies" $STD apt-get install -y \ - ffmpeg + ffmpeg \ + jq msg_ok "Installed Dependencies" read -r -p "Do you need the intel-media-va-driver-non-free driver for HW encoding (Debian 12 only)? " prompt @@ -53,8 +54,8 @@ msg_info "Setup ${APPLICATION}" $STD ln -svf /usr/bin/ffmpeg /usr/local/bin/ffmpeg $STD ln -svf /usr/bin/ffprobe /usr/local/bin/ffprobe temp_file=$(mktemp) -curl -fsSL https://fileflows.com/downloads/zip -o $temp_file -unzip -q -d /opt/fileflows $temp_file +curl -fsSL https://fileflows.com/downloads/zip -o "$temp_file" +unzip -q -d /opt/fileflows "$temp_file" (cd /opt/fileflows/Server && dotnet FileFlows.Server.dll --systemd install --root true) systemctl enable -q --now fileflows.service msg_ok "Setup ${APPLICATION}" @@ -63,7 +64,7 @@ motd_ssh customize msg_info "Cleaning up" -rm -f $temp_file +rm -f "$temp_file" $STD apt-get -y autoremove $STD apt-get -y autoclean msg_ok "Cleaned"