arch_agent/aur-shield
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: add timeouts to curl calls — installer hangs on unreachable server

Browse Source
This commit is contained in:
arch_agent
2026-08-04 11:38:21 +02:00
parent 1f67f6f976
commit a00a9f2b99
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-client.sh
+8 -1
View File
@@ -24,6 +24,13 @@ fi
echo "Server: http://$SHIELD_HOST:$SHIELD_PORT" echo "Server: http://$SHIELD_HOST:$SHIELD_PORT"
echo "" echo ""
# Quick connectivity check (3s timeout)
if ! curl -sf --max-time 3 "http://$SHIELD_HOST:$SHIELD_PORT/api/status" >/dev/null 2>&1; then
echo "⚠ WARNING: Server at $SHIELD_HOST:$SHIELD_PORT not reachable!"
echo " Continuing anyway — config will be written but safe-yay may fail."
echo ""
fi
# Write config file # Write config file
echo "Writing /etc/safe-yay.conf..." echo "Writing /etc/safe-yay.conf..."
sudo tee /etc/safe-yay.conf > /dev/null << EOFCONF sudo tee /etc/safe-yay.conf > /dev/null << EOFCONF
@@ -35,7 +42,7 @@ echo "✓ Config written to /etc/safe-yay.conf"
# Add pacman repo (skip if scan-only server — no repo needed) # Add pacman repo (skip if scan-only server — no repo needed)
# Check if server is scan-only by querying status # Check if server is scan-only by querying status
SERVER_SCAN_ONLY=$(curl -sf "http://$SHIELD_HOST:$SHIELD_PORT/api/status" 2>/dev/null | python3 -c "import sys,json; print(json.loads(sys.stdin.read()).get('scan_only',False))" 2>/dev/null || echo False) SERVER_SCAN_ONLY=$(curl -sf --max-time 5 "http://$SHIELD_HOST:$SHIELD_PORT/api/status" 2>/dev/null | python3 -c "import sys,json; print(json.loads(sys.stdin.read()).get('scan_only',False))" 2>/dev/null || echo False)
PACMAN_CONF="/etc/pacman.conf" PACMAN_CONF="/etc/pacman.conf"