diff --git a/ct/shelfmark.sh b/ct/shelfmark.sh index 0bec17a25..04a4fa4bd 100644 --- a/ct/shelfmark.sh +++ b/ct/shelfmark.sh @@ -42,16 +42,19 @@ function update_script() { msg_info "Stopping FlareSolverr service" systemctl stop flaresolverr msg_ok "Stopped FlareSolverr service" - + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "flaresolverr" "FlareSolverr/FlareSolverr" "prebuild" "latest" "/opt/flaresolverr" "flaresolverr_linux_x64.tar.gz" - + msg_info "Starting FlareSolverr Service" systemctl start flaresolverr msg_ok "Started FlareSolverr Service" msg_ok "Updated FlareSolverr" fi - + cp /opt/shelfmark/start.sh /opt/start.sh.bak + if command -v chromedriver &>/dev/null; then + $STD apt remove -y chromium-driver + fi CLEAN_INSTALL=1 fetch_and_deploy_gh_release "shelfmark" "calibrain/shelfmark" "tarball" "latest" "/opt/shelfmark" RELEASE_VERSION=$(cat "$HOME/.shelfmark") diff --git a/frontend/public/json/shelfmark.json b/frontend/public/json/shelfmark.json index 5656c4feb..b0e6de2b8 100644 --- a/frontend/public/json/shelfmark.json +++ b/frontend/public/json/shelfmark.json @@ -35,6 +35,10 @@ { "text": "The configuration at `/etc/shelfmark/.env` is for bootstrapping the initial install. Customize the configuration via the Shelfmark UI.", "type": "info" + }, + { + "text": "This version of the application does not support routing through Tor (the `USING_TOR` env var).", + "type": "info" } ] } diff --git a/install/shelfmark-install.sh b/install/shelfmark-install.sh index 7889d74a6..88258bbb1 100644 --- a/install/shelfmark-install.sh +++ b/install/shelfmark-install.sh @@ -14,14 +14,14 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt install -y \ - unrar-free +$STD apt install -y unrar-free ln -sf /usr/bin/unrar-free /usr/bin/unrar msg_ok "Installed Dependencies" mkdir -p /etc/shelfmark cat </etc/shelfmark/.env DOCKERMODE=false +URL_BASE="" CONFIG_DIR=/etc/shelfmark TMP_DIR=/tmp/shelfmark ENABLE_LOGGING=true @@ -111,7 +111,6 @@ else ffmpeg \ chromium-common \ chromium \ - chromium-driver \ python3-tk msg_ok "Installed internal bypasser dependencies" fi