Skip to content

Commit ea62c0e

Browse files
PDowneyPDowney
authored
Updates
Mostly just adding error handling to source calls.
1 parent 23c690a commit ea62c0e

137 files changed

Lines changed: 318 additions & 290 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/enginescript-build-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ jobs:
391391
392392
# Test sourcing the files to ensure they don't hang
393393
echo "🧪 Testing configuration file loading..."
394-
if timeout 10 bash -c "source /usr/local/bin/enginescript/enginescript-variables.txt"; then
394+
if timeout 10 bash -c "source /usr/local/bin/enginescript/enginescript-variables.txt || { echo "Error: Failed to source /usr/local/bin/enginescript/enginescript-variables.txt" >&2; exit 1; }"; then
395395
echo "✅ Variables file loads successfully"
396396
else
397397
echo "❌ Variables file failed to load or timed out"

‎config/var/www/admin/control-panel/classes/SystemCommand.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ private static function execProc(array $argv, bool $captureStderr = false): stri
205205
private static function buildPipeSpec(bool $captureStderr): array
206206
{
207207
$null = ['file', '/dev/null', 'w'];
208-
$pipe = ['pipe', 'w'];
208+
$pipe = ['pipe', 'r'];
209209

210210
if ($captureStderr) {
211211
return [[0 => ['file', '/dev/null', 'r'], 1 => $null, 2 => $pipe], 2];
@@ -263,7 +263,7 @@ public static function getNetworkIP(): string|false
263263
}
264264

265265
// Extract source IP from "... src 10.0.0.1 ..." and validate it
266-
if (preg_match('/src\s+(\S+)/', $output, $matches)) {
266+
if (preg_match('/\bsrc\s+([0-9a-fA-F:.]+)/', $output, $matches)) {
267267
$ip = $matches[1];
268268
if (filter_var($ip, FILTER_VALIDATE_IP) !== false) {
269269
return $ip;

‎config/var/www/admin/control-panel/modules/utils.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ export class DashboardUtils {
6363
return fallback;
6464
}
6565

66-
return cleaned;
66+
// Normalize output so that it always includes a '%' symbol.
67+
const normalized = cleaned.endsWith("%") ? cleaned : cleaned + "%";
68+
return normalized;
6769
}
6870

6971
static sanitizeUrl(input, fallback = "") {
@@ -92,7 +94,7 @@ export class DashboardUtils {
9294
return sanitized;
9395
}
9496

95-
setTextContent(elementId, content) {
97+
static setTextContent(elementId, content) {
9698
const element = document.getElementById(elementId);
9799
if (element) {
98100
const safeContent = content ?? "";

‎scripts/functions/alias/alias-backup.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#----------------------------------------------------------------------------------
99

1010
# EngineScript Variables
11-
source /usr/local/bin/enginescript/enginescript-variables.txt
11+
source /usr/local/bin/enginescript/enginescript-variables.txt || { echo "Error: Failed to source /usr/local/bin/enginescript/enginescript-variables.txt" >&2; exit 1; }
1212
source /home/EngineScript/enginescript-install-options.txt
1313

1414
# Source shared functions library
15-
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh || { echo "Error: Failed to source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh" >&2; exit 1; }
1616

1717

1818
#----------------------------------------------------------------------------------

‎scripts/functions/alias/alias-cache.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#----------------------------------------------------------------------------------
99

1010
# EngineScript Variables
11-
source /usr/local/bin/enginescript/enginescript-variables.txt
11+
source /usr/local/bin/enginescript/enginescript-variables.txt || { echo "Error: Failed to source /usr/local/bin/enginescript/enginescript-variables.txt" >&2; exit 1; }
1212
source /home/EngineScript/enginescript-install-options.txt
1313

1414
# Source shared functions library
15-
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh || { echo "Error: Failed to source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh" >&2; exit 1; }
1616

1717

1818
#----------------------------------------------------------------------------------

‎scripts/functions/alias/alias-debug.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#----------------------------------------------------------------------------------
99

1010
# EngineScript Variables
11-
source /usr/local/bin/enginescript/enginescript-variables.txt
11+
source /usr/local/bin/enginescript/enginescript-variables.txt || { echo "Error: Failed to source /usr/local/bin/enginescript/enginescript-variables.txt" >&2; exit 1; }
1212
source /home/EngineScript/enginescript-install-options.txt
1313

1414
# Source shared functions library
15-
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh || { echo "Error: Failed to source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh" >&2; exit 1; }
1616

1717

1818
#----------------------------------------------------------------------------------

‎scripts/functions/alias/alias-help.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#----------------------------------------------------------------------------------
99

1010
# EngineScript Variables
11-
source /usr/local/bin/enginescript/enginescript-variables.txt
11+
source /usr/local/bin/enginescript/enginescript-variables.txt || { echo "Error: Failed to source /usr/local/bin/enginescript/enginescript-variables.txt" >&2; exit 1; }
1212
source /home/EngineScript/enginescript-install-options.txt
1313

1414
# Source shared functions library
15-
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh || { echo "Error: Failed to source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh" >&2; exit 1; }
1616

1717
#----------------------------------------------------------------------------------
1818

‎scripts/functions/alias/alias-mysql-pass.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#----------------------------------------------------------------------------------
99

1010
# EngineScript Variables
11-
source /usr/local/bin/enginescript/enginescript-variables.txt
11+
source /usr/local/bin/enginescript/enginescript-variables.txt || { echo "Error: Failed to source /usr/local/bin/enginescript/enginescript-variables.txt" >&2; exit 1; }
1212
source /home/EngineScript/enginescript-install-options.txt
1313

1414
# Source shared functions library
15-
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh || { echo "Error: Failed to source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh" >&2; exit 1; }
1616

1717

1818
#----------------------------------------------------------------------------------

‎scripts/functions/alias/alias-restart.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#----------------------------------------------------------------------------------
99

1010
# EngineScript Variables
11-
source /usr/local/bin/enginescript/enginescript-variables.txt
11+
source /usr/local/bin/enginescript/enginescript-variables.txt || { echo "Error: Failed to source /usr/local/bin/enginescript/enginescript-variables.txt" >&2; exit 1; }
1212
source /home/EngineScript/enginescript-install-options.txt
1313

1414
# Source shared functions library
15-
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh || { echo "Error: Failed to source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh" >&2; exit 1; }
1616

1717
#----------------------------------------------------------------------------------
1818

‎scripts/functions/alias/alias-server-info.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#----------------------------------------------------------------------------------
99

1010
# EngineScript Variables
11-
source /usr/local/bin/enginescript/enginescript-variables.txt
11+
source /usr/local/bin/enginescript/enginescript-variables.txt || { echo "Error: Failed to source /usr/local/bin/enginescript/enginescript-variables.txt" >&2; exit 1; }
1212
source /home/EngineScript/enginescript-install-options.txt
1313

1414
# Source shared functions library
15-
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh || { echo "Error: Failed to source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh" >&2; exit 1; }
1616

1717

1818
#----------------------------------------------------------------------------------

0 commit comments

Comments
 (0)