From bc234f4d5cf99cb2b4614bd8b253b7a818320cf5 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Sun, 14 May 2023 15:06:35 +0300
Subject: [PATCH] Fixed linux not working. 0.0.7 => 0.0.8

---
 package.json                     | 2 +-
 src-tauri/Cargo.lock             | 2 +-
 src-tauri/Cargo.toml             | 2 +-
 src-tauri/frontends.json         | 8 --------
 src-tauri/tauri.conf.json        | 6 +++---
 src/services/binary_frontends.js | 4 ++--
 6 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 0831c7c..cdb2457 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "libredirect_frontends_manager",
   "private": true,
-  "version": "0.0.7",
+  "version": "0.0.8",
   "type": "module",
   "scripts": {
     "tauri": "tauri"
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index f16af15..526b288 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1461,7 +1461,7 @@ dependencies = [
 
 [[package]]
 name = "libredirect_frontends_manager"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "serde",
  "serde_json",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index e4dba1c..7798f74 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libredirect_frontends_manager"
-version = "0.0.7"
+version = "0.0.8"
 description = "Host privacy frontends locally on your computer rather than relying on 3rd party instances"
 authors = ["you"]
 license = ""
diff --git a/src-tauri/frontends.json b/src-tauri/frontends.json
index 33a6c82..cc8b020 100644
--- a/src-tauri/frontends.json
+++ b/src-tauri/frontends.json
@@ -1,12 +1,4 @@
 {
-    "caddy": {
-        "name": "Caddy",
-        "command_linux": "./caddy_linux_amd64",
-        "command_windows": "$APPLOCALDATA\\caddy\\caddy_windows_amd64.exe",
-        "args": [
-            "run"
-        ]
-    },
     "libreddit": {
         "name": "LibReddit",
         "icon": "libreddit-icon.png",
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 121e287..c660a36 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Libredirect Frontends Manager",
-    "version": "0.0.7"
+    "version": "0.0.8"
   },
   "tauri": {
     "allowlist": {
@@ -43,8 +43,8 @@
         "all": true,
         "scope": [
           {
-            "name": "./caddy_linux_amd64",
-            "cmd": "./caddy_linux_amd64",
+            "name": "$APPLOCALDATA/caddy/caddy_linux_amd64",
+            "cmd": "$APPLOCALDATA/caddy/caddy_linux_amd64",
             "args": true
           },
           {
diff --git a/src/services/binary_frontends.js b/src/services/binary_frontends.js
index 168122e..9d72664 100644
--- a/src/services/binary_frontends.js
+++ b/src/services/binary_frontends.js
@@ -48,9 +48,9 @@ async function run_caddy() {
     }
     let command
     if (platform == 'win32') {
-        command = config['caddy'].command_windows
+        command = '$APPLOCALDATA\\caddy\\caddy_windows_amd64.exe'
     } else if (platform == 'linux') {
-        command = config['caddy'].command_linux
+        command = '$APPLOCALDATA/caddy/caddy_linux_amd64'
     }
     const cmd = new shell.Command(command, ['run'], { cwd: await path.resolveResource('') })
     cmd.on('error', error => {