Skip to content

Commit c481569

Browse files
author
root
committed
fix(toolkit-install): fix set -e exit in preflight() when LE_EMAIL empty (v1.0.2)
preflight() last command was '[ -n "$LE_EMAIL" ] && log ...' which exits 1 when LE_EMAIL is unset. With set -euo pipefail, the function returned 1 and the caller's set -e immediately exited the script. Convert to if...fi form so the function always returns 0.
1 parent fc93748 commit c481569

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

docs/perfsonar/tools_scripts/perfSONAR-toolkit-install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
3-
# Version: 1.0.1
3+
# Version: 1.0.2
44
# Author: Shawn McKee, University of Michigan
55
# Acknowledgements: Supported by IRIS-HEP and OSG-LHC
66

@@ -110,8 +110,8 @@ preflight() {
110110
log "=== perfSONAR Toolkit Installer started on $(hostname -f) ==="
111111
log "Kernel: $(uname -r) Date: $(date -u)"
112112
log "Bundle: perfsonar-${BUNDLE}"
113-
[ -n "$LE_FQDN" ] && log "LE FQDN: $LE_FQDN"
114-
[ -n "$LE_EMAIL" ] && log "LE Email: $LE_EMAIL"
113+
if [ -n "$LE_FQDN" ]; then log "LE FQDN: $LE_FQDN"; fi
114+
if [ -n "$LE_EMAIL" ]; then log "LE Email: $LE_EMAIL"; fi
115115
}
116116

117117
# ---------------------------------------------------------------------------

docs/perfsonar/tools_scripts/scripts.sha256

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ e1944123e17c89e8f202cca960f147397d64ae1e675af132c84b02ced2564abb node_exporter.
1818
50dfab90bc21d5c566b713f48b00b079a32a8b8756432a0d0f66ac6a64e6e581 perfSONAR-health-monitor.sh
1919
d8e3cc4a03725c7fb6e12c13e5036e7c6a3af301a1f1e728690ce9ad3ab8aa96 install_tools_scripts.sh
2020
7be726de5dfdbe8f7f5ac8e803b0b71e8f98f1ba274ca70b42f8eba4822cc67b perfSONAR-orchestrator.sh
21-
e710b020c39033406a7184e984687bf9c95c60e30b4136b2d7d0c756d5b0f323 perfSONAR-toolkit-install.sh
21+
eea859a611996827d36f852a052c1cb48adac969888110b902d3dd00f53ca10f perfSONAR-toolkit-install.sh
2222
2615a29d65e285391adb547046584c4534ea548e69571b67e0cf35773b010c57 perfSONAR-diagnostic-report.sh
2323
ac0c8fd6f27cc156ec05c7e6ac3547e0732f436a7033dac34475ece5641a284f docs/perfsonar/tools_scripts/perfSONAR-install-flowd-go.sh
2424
39d226a857eb1a0956003c75ca8b558fcb55c63176286ca9597f031d08cb38a7 docs/perfsonar/tools_scripts/update-perfsonar-deployment.sh

0 commit comments

Comments
 (0)