From 198cfe501508366f400c43a9156e44ed8fc69f31 Mon Sep 17 00:00:00 2001
From: Eli Bosley <ekbosley@gmail.com>
Date: Fri, 25 Oct 2024 09:23:04 -0400
Subject: [PATCH] fix: unraid-api in usr/bin

---
 api/src/dotenv.ts                                           | 6 ++++++
 api/src/store/modules/paths.ts                              | 2 +-
 plugin/plugins/dynamix.unraid.net.plg                       | 3 ++-
 .../emhttp/plugins/dynamix.my.servers/include/state.php     | 2 +-
 .../plugins/dynamix.my.servers/include/unraid-api.php       | 2 +-
 web/_webGui/testWebComponents.page                          | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 api/src/dotenv.ts

diff --git a/api/src/dotenv.ts b/api/src/dotenv.ts
new file mode 100644
index 000000000..0403f1f33
--- /dev/null
+++ b/api/src/dotenv.ts
@@ -0,0 +1,6 @@
+import { config } from 'dotenv';
+
+export const env = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test'
+	? config({ debug: true, path: `./.env.${process.env.NODE_ENV}` }) : config({
+		path: '/usr/local/unraid-api/.env',
+	});
diff --git a/api/src/store/modules/paths.ts b/api/src/store/modules/paths.ts
index c1ec2ad6e..81519c71d 100644
--- a/api/src/store/modules/paths.ts
+++ b/api/src/store/modules/paths.ts
@@ -3,7 +3,7 @@ import { join, resolve as resolvePath } from 'path';
 
 const initialState = {
     core: import.meta.dirname,
-    'unraid-api-base': '/usr/local/bin/unraid-api/' as const,
+    'unraid-api-base': '/usr/local/unraid-api/' as const,
     'unraid-data': resolvePath(
         process.env.PATHS_UNRAID_DATA ?? ('/boot/config/plugins/dynamix.my.servers/data/' as const)
     ),
diff --git a/plugin/plugins/dynamix.unraid.net.plg b/plugin/plugins/dynamix.unraid.net.plg
index 45ed057df..83ef24f61 100755
--- a/plugin/plugins/dynamix.unraid.net.plg
+++ b/plugin/plugins/dynamix.unraid.net.plg
@@ -721,7 +721,8 @@ if [[ -z "${email}" ]] || [[ CFG_CLEANED -eq 1 ]]; then
 fi
 
 # make the unraid-api work globally for easy cli access
-ln -s /usr/local/bin/unraid-api/unraid-api /usr/local/sbin/unraid-api
+ln -s /usr/bin/unraid-api /usr/local/sbin/unraid-api
+ln -s /usr/bin/unraid-api /usr/local/bin/unraid-api
 
 # configure flash backup to stop when the system starts shutting down
 [[ ! -d /etc/rc.d/rc6.d ]] && mkdir /etc/rc.d/rc6.d
diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php
index 66ea9c259..e037067a6 100644
--- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php
+++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php
@@ -129,7 +129,7 @@ class ServerState
         if (file_exists('/var/lib/pkgtools/packages/dynamix.unraid.net.staging')) {
             $this->connectPluginInstalled = 'dynamix.unraid.net.staging.plg';
         }
-        if ($this->connectPluginInstalled && !file_exists('/usr/local/bin/unraid-api')) {
+        if ($this->connectPluginInstalled && !file_exists('/usr/bin/unraid-api')) {
             $this->connectPluginInstalled .= '_installFailed';
         }
 
diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/unraid-api.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/unraid-api.php
index a055f1f5e..7f4d3a93a 100644
--- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/unraid-api.php
+++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/unraid-api.php
@@ -54,7 +54,7 @@ if ($cli) {
 }
 if (!in_array($command, $validCommands)) $command = 'none';
 
-if (!file_exists('/usr/local/sbin/unraid-api') || !file_exists('/usr/local/bin/unraid-api/unraid-api')) {
+if (!file_exists('/usr/bin/unraid-api')) {
   response_complete(406, array('error' => 'Please reinstall the Unraid Connect plugin'));
 }
 
diff --git a/web/_webGui/testWebComponents.page b/web/_webGui/testWebComponents.page
index 55f384ac5..c789a858c 100644
--- a/web/_webGui/testWebComponents.page
+++ b/web/_webGui/testWebComponents.page
@@ -64,7 +64,7 @@ if (!file_exists('/var/lib/pkgtools/packages/dynamix.unraid.net') && !file_exist
   if (file_exists('/var/lib/pkgtools/packages/dynamix.unraid.net')) $connectPluginInstalled = 'dynamix.unraid.net.plg';
   if (file_exists('/var/lib/pkgtools/packages/dynamix.unraid.net.staging')) $connectPluginInstalled = 'dynamix.unraid.net.staging.plg';
   // plugin install failed • append failure detected so we can show warning about failed install via UPC
-  if (!file_exists('/usr/local/bin/unraid-api')) $connectPluginInstalled = $connectPluginInstalled . '_installFailed';
+  if (!file_exists('/usr/bin/unraid-api')) $connectPluginInstalled = $connectPluginInstalled . '_installFailed';
 }
 
 $serverData = [