Proxmox/ProxmoxVE
1
0
Fork 1
mirror of https://github.com/community-scripts/ProxmoxVE.git synced 2026-08-20 03:22:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

patchmon: simplify SCAP content fetch with &&/|| chaining

Browse Source
This commit is contained in:
MickLesk
2026-08-14 10:00:51 +02:00
parent fe6e395fc8
commit 6b8cf490e0
2 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ct/patchmon.sh
+6 -13
View File
@@ -33,20 +33,13 @@ function update_script() {
msg_info "Checking SCAP Security Guide content"
SSG_DIR="/opt/patchmon/ssg-content"
SSG_LATEST=$(get_latest_github_release "ComplianceAsCode/content") || SSG_LATEST=""
SSG_CURRENT=$(cat "$SSG_DIR/.ssg-version" 2>/dev/null || echo "")
if [[ -n "$SSG_LATEST" && "$SSG_LATEST" != "$SSG_CURRENT" ]]; then
rm -rf "$SSG_DIR"
mkdir -p "$SSG_DIR"
if curl -fsSL "https://github.com/ComplianceAsCode/content/releases/download/v${SSG_LATEST}/scap-security-guide-${SSG_LATEST}.tar.gz" |
tar -xz -C "$SSG_DIR" --strip-components=1 --wildcards '*/ssg-*-ds.xml'; then
echo "$SSG_LATEST" >"$SSG_DIR/.ssg-version"
msg_ok "Updated SCAP Security Guide content (v${SSG_LATEST})"
else
msg_warn "Could not update SCAP Security Guide content"
fi
else
msg_ok "SCAP Security Guide content is current"
if [[ -n "$SSG_LATEST" && "$SSG_LATEST" != "$(cat "$SSG_DIR/.ssg-version" 2>/dev/null)" ]]; then
rm -rf "$SSG_DIR" && mkdir -p "$SSG_DIR"
curl -fsSL "https://github.com/ComplianceAsCode/content/releases/download/v${SSG_LATEST}/scap-security-guide-${SSG_LATEST}.tar.gz" |
tar -xz -C "$SSG_DIR" --strip-components=1 --wildcards '*/ssg-*-ds.xml' &&
echo "$SSG_LATEST" >"$SSG_DIR/.ssg-version" || msg_warn "Could not update SCAP Security Guide content"
fi
msg_ok "SCAP Security Guide content checked"
if check_for_gh_release "PatchMon" "PatchMon/PatchMon"; then
msg_info "Stopping Service"
install/patchmon-install.sh
+5 -8
View File
@@ -89,14 +89,11 @@ msg_ok "Fetched PatchMon agent binaries"
msg_info "Fetching SCAP Security Guide content"
SSG_DIR="/opt/patchmon/ssg-content"
mkdir -p "$SSG_DIR"
SSG_RELEASE=$(get_latest_github_release "ComplianceAsCode/content") || SSG_RELEASE=""
if [[ -n "$SSG_RELEASE" ]] && curl -fsSL "https://github.com/ComplianceAsCode/content/releases/download/v${SSG_RELEASE}/scap-security-guide-${SSG_RELEASE}.tar.gz" |
tar -xz -C "$SSG_DIR" --strip-components=1 --wildcards '*/ssg-*-ds.xml'; then
echo "$SSG_RELEASE" >"$SSG_DIR/.ssg-version"
msg_ok "Fetched SCAP Security Guide content (v${SSG_RELEASE})"
else
msg_warn "Could not fetch SCAP Security Guide content; it will be fetched on the next update"
fi
SSG_RELEASE=$(get_latest_github_release "ComplianceAsCode/content") &&
curl -fsSL "https://github.com/ComplianceAsCode/content/releases/download/v${SSG_RELEASE}/scap-security-guide-${SSG_RELEASE}.tar.gz" |
tar -xz -C "$SSG_DIR" --strip-components=1 --wildcards '*/ssg-*-ds.xml' &&
echo "$SSG_RELEASE" >"$SSG_DIR/.ssg-version" || msg_warn "Could not fetch SCAP Security Guide content"
msg_ok "Fetched SCAP Security Guide content"
msg_info "Creating service"
cat <<EOF >/etc/systemd/system/patchmon-server.service