From 18f13783b9082f8c3c2137945e7b6d6e8c482400 Mon Sep 17 00:00:00 2001
From: Dominik Siebel <dominik.siebel@trivago.com>
Date: Fri, 25 Oct 2024 09:14:35 +0200
Subject: [PATCH] install in opt and read version from zoraxy --version
---
ct/zoraxy.sh | 7 +++----
install/zoraxy-install.sh | 6 +++---
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ct/zoraxy.sh b/ct/zoraxy.sh
index f4e4d51c..41cfda30 100644
--- a/ct/zoraxy.sh
+++ b/ct/zoraxy.sh
@@ -54,14 +54,13 @@ function default_settings() {
function update_script() {
header_info
-if [[ ! -f /etc/systemd/system/zoraxy.service ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
+if [[ ! -f /etc/systemd/system/zoraxy.service ]] || [[ ! -x "/opt/zoraxy" ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
RELEASE="$(curl -s https://api.github.com/repos/tobychui/zoraxy/releases | grep -oP '"tag_name":\s*"\K[\d.]+?(?=")' | sort -V | tail -n1)"
msg_info "Updating ${APP} LXC to ${RELEASE}"
-if [[ "${RELEASE}" != "$(cat "/opt/${APP}_version.txt")" ]] || [[ ! -f "/opt/${APP}_version.txt" ]]; then
+if [[ "${RELEASE}" != "$(/opt/zoraxy --version | cut -d' ' -f4)" ]]; then
wget -q "https://github.com/tobychui/zoraxy/releases/download/${RELEASE}/zoraxy_linux_amd64"
- install zoraxy_linux_amd64 /usr/bin/zoraxy
+ install zoraxy_linux_amd64 /opt/zoraxy
rm zoraxy_linux_amd64
- echo "${RELEASE}" > "/opt/${APP}_version.txt"
systemctl restart zoraxy.service
msg_ok "Updated ${APP} LXC"
else
diff --git a/install/zoraxy-install.sh b/install/zoraxy-install.sh
index 9e720d14..f2ad6a49 100644
--- a/install/zoraxy-install.sh
+++ b/install/zoraxy-install.sh
@@ -22,8 +22,8 @@ msg_ok "Installed Dependencies"
RELEASE="$(curl -s https://api.github.com/repos/tobychui/zoraxy/releases | grep -oP '"tag_name":\s*"\K[\d.]+?(?=")' | sort -V | tail -n1)"
msg_info "Installing Zoraxy v${RELEASE}"
wget -q "https://github.com/tobychui/zoraxy/releases/download/${RELEASE}/zoraxy_linux_amd64"
-install zoraxy_linux_amd64 /usr/bin/zoraxy
-echo "${RELEASE}" > "/opt/${APPLICATION}_version.txt"
+install zoraxy_linux_amd64 /opt/zoraxy
+rm zoraxy_linux_amd64
msg_ok "Installed Zoraxy"
msg_info "Creating Service"
@@ -33,7 +33,7 @@ Description=General purpose request proxy and forwarding tool
After=syslog.target network-online.target
[Service]
-ExecStart=/usr/bin/zoraxy
+ExecStart=/opt/zoraxy
Restart=always
[Install]