mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2025-12-30 21:19:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: unraid-api in usr/bin

Browse Source
This commit is contained in:
Eli Bosley
2024-10-25 09:23:04 -04:00
parent 42189dd451
commit 198cfe5015
6 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/dotenv.ts Normal file
View File

@@ -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',
});

2
api/src/store/modules/paths.ts
View File

@@ -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)
),

3
plugin/plugins/dynamix.unraid.net.plg
View File

@@ -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

2
plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/state.php
View File

@@ -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';
}

2
plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/unraid-api.php
View File

@@ -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'));
}

2
web/_webGui/testWebComponents.page
View File

@@ -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 = [