From 508356898fa88c65e32c5d0de6688a9a7b09f156 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Tue, 8 Aug 2023 08:16:47 -0700
Subject: [PATCH] Fixes for linux (#273)

* Use prebuilt OpenVPN binary for Linux
---
 client/3rd-prebuilt           | 2 +-
 client/utilities.cpp          | 2 +-
 service/server/CMakeLists.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index f339911d..75e352b4 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit f339911dcb75d8a199e508cc2c2f32851cf211b8
+Subproject commit 75e352b40ede4324248b7594b70dbdaa1a7a7f41
diff --git a/client/utilities.cpp b/client/utilities.cpp
index d286bcc7..7c9c79cd 100644
--- a/client/utilities.cpp
+++ b/client/utilities.cpp
@@ -219,7 +219,7 @@ QString Utils::openVpnExecPath()
 #ifdef Q_OS_WIN
     return Utils::executable("openvpn/openvpn", true);
 #elif defined Q_OS_LINUX
-    return Utils::usrExecutable("openvpn");
+    return Utils::executable("openvpn", true);
 #else
     return Utils::executable("/openvpn", true);
 #endif
diff --git a/service/server/CMakeLists.txt b/service/server/CMakeLists.txt
index d4d86b53..5435b80e 100644
--- a/service/server/CMakeLists.txt
+++ b/service/server/CMakeLists.txt
@@ -233,7 +233,7 @@ if(WIN32)
         set(DEPLOY_PLATFORM_PATH "windows/x32")
     endif()
 elseif(LINUX)
-    set(DEPLOY_PLATFORM_PATH "linux/service")
+    set(DEPLOY_PLATFORM_PATH "linux/client")
 elseif(APPLE AND NOT IOS)
     set(DEPLOY_PLATFORM_PATH "macos")
 endif()