diff --git a/ct/shelfmark.sh b/ct/shelfmark.sh index e0ecbf45d..0461e8460 100644 --- a/ct/shelfmark.sh +++ b/ct/shelfmark.sh @@ -36,9 +36,18 @@ function update_script() { if check_for_gh_release "shelfmark" "calibrain/shelfmark"; then msg_info "Stopping Service(s)" systemctl stop shelfmark - [[ -f /etc/systemd/system/chromium.service ]] && systemctl stop chromium msg_ok "Stopped Service(s)" + if [[ $(sed -n '/_BYPASS=/s/[^=]*=//p' /etc/shelfmark/.env) == "true" ]] && + [[ $(sed -n '/BYPASSER=/s/[^=]*=//p' /etc/shelfmark/.env) == "false" ]]; then + msg_info "Updating internal bypasser configuration" + systemctl disable -q --now chromium 2>/dev/null || true + rm -f /etc/systemd/system/chromium.service + systemctl daemon-reload + sed -i '/DOCKERMODE=/s/false/true/' /etc/shelfmark/.env + msg_ok "Updated internal bypasser configuration" + fi + [[ -f /etc/systemd/system/flaresolverr.service ]] && if check_for_gh_release "flaresolverr" "Flaresolverr/Flaresolverr"; then msg_info "Stopping FlareSolverr service" systemctl stop flaresolverr @@ -79,7 +88,6 @@ function update_script() { msg_info "Starting Service(s)" systemctl start shelfmark - [[ -f /etc/systemd/system/chromium.service ]] && systemctl start chromium msg_ok "Started Service(s)" msg_ok "Updated successfully!" fi diff --git a/install/shelfmark-install.sh b/install/shelfmark-install.sh index c477caca3..308f97946 100644 --- a/install/shelfmark-install.sh +++ b/install/shelfmark-install.sh @@ -116,6 +116,7 @@ else chromium-common \ chromium \ python3-tk + sed -i '/DOCKERMODE=/s/false/true/' /etc/shelfmark/.env msg_ok "Installed internal bypasser dependencies" fi @@ -165,22 +166,6 @@ KillMode=mixed WantedBy=multi-user.target EOF -if [[ "$DEPLOYMENT_TYPE" == "1" ]]; then - cat </etc/systemd/system/chromium.service -[Unit] -Description=Chromium Headless Browser -After=network.target - -[Service] -User=root -ExecStart=/usr/bin/chromium --headless --no-sandbox --disable-gpu --disable-dev-shm-usage --remote-debugging-address=127.0.0.1 --remote-debugging-port=9222 --hide-scrollbars -Restart=always - -[Install] -WantedBy=multi-user.target -EOF - systemctl enable -q --now chromium -fi if [[ "$DEPLOYMENT_TYPE" == "2" ]]; then cat </etc/systemd/system/flaresolverr.service [Unit]