Skip to content

Commit 5bad80e

Browse files
authored
Refactor: FlareSolverr (#5845)
* Refactor * Update flaresolverr.sh * Update flaresolverr.sh * Update flaresolverr-install.sh
1 parent 89498f4 commit 5bad80e

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

ct/flaresolverr.sh

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,23 @@ function update_script() {
2323
header_info
2424
check_container_storage
2525
check_container_resources
26+
2627
if [[ ! -f /etc/systemd/system/flaresolverr.service ]]; then
2728
msg_error "No ${APP} Installation Found!"
2829
exit
2930
fi
30-
RELEASE=$(curl -fsSL https://github.com/FlareSolverr/FlareSolverr/releases/latest | grep "title>Release" | cut -d " " -f 4)
31-
if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then
32-
msg_info "Updating $APP LXC"
31+
RELEASE=$(curl -fsSL https://api.github.com/repos/FlareSolverr/FlareSolverr/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4)}')
32+
if [[ "${RELEASE}" != "$(cat ~/.flaresolverr 2>/dev/null)" ]] || [[ ! -f ~/.flaresolverr ]]; then
33+
msg_info "Stopping service"
3334
systemctl stop flaresolverr
34-
curl -fsSL "https://github.com/FlareSolverr/FlareSolverr/releases/download/$RELEASE/flaresolverr_linux_x64.tar.gz" -o $(basename "https://github.com/FlareSolverr/FlareSolverr/releases/download/$RELEASE/flaresolverr_linux_x64.tar.gz")
35-
tar -xzf flaresolverr_linux_x64.tar.gz -C /opt
36-
rm flaresolverr_linux_x64.tar.gz
35+
msg_ok "Stopped service"
36+
37+
rm -rf /opt/flaresolverr
38+
fetch_and_deploy_gh_release "flaresolverr" "FlareSolverr/FlareSolverr" "prebuild" "latest" "/opt/flaresolverr" "flaresolverr_linux_x64.tar.gz"
39+
40+
msg_info "Starting service"
3741
systemctl start flaresolverr
38-
echo "${RELEASE}" >/opt/${APP}_version.txt
39-
msg_ok "Updated $APP LXC"
42+
msg_ok "Started service"
4043
else
4144
msg_ok "No update required. ${APP} is already at ${RELEASE}"
4245
fi

install/flaresolverr-install.sh

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ network_check
1515
update_os
1616

1717
msg_info "Installing Dependencies"
18-
$STD apt-get install -y apt-transport-https
19-
$STD apt-get install -y xvfb
18+
$STD apt-get install -y \
19+
apt-transport-https \
20+
xvfb
2021
msg_ok "Installed Dependencies"
2122

2223
msg_info "Installing Chrome"
@@ -26,13 +27,7 @@ $STD apt update
2627
$STD apt install -y google-chrome-stable
2728
msg_ok "Installed Chrome"
2829

29-
msg_info "Installing FlareSolverr"
30-
RELEASE=$(curl -fsSL https://github.com/FlareSolverr/FlareSolverr/releases/latest | grep "title>Release" | cut -d " " -f 4)
31-
$STD curl -fsSL "https://github.com/FlareSolverr/FlareSolverr/releases/download/$RELEASE/flaresolverr_linux_x64.tar.gz" -o "flaresolverr_linux_x64.tar.gz"
32-
$STD tar -xzf flaresolverr_linux_x64.tar.gz -C /opt
33-
$STD rm flaresolverr_linux_x64.tar.gz
34-
echo "${RELEASE}" >/opt/"${APPLICATION}"_version.txt
35-
msg_ok "Installed FlareSolverr"
30+
fetch_and_deploy_gh_release "flaresolverr" "FlareSolverr/FlareSolverr" "prebuild" "latest" "/opt/flaresolverr" "flaresolverr_linux_x64.tar.gz"
3631

3732
msg_info "Creating Service"
3833
cat <<EOF >/etc/systemd/system/flaresolverr.service

0 commit comments

Comments
 (0)