diff --git a/.github/workflows/shellcheck.yaml b/.github/workflows/shellcheck.yaml index 6c445a5..56ebf79 100644 --- a/.github/workflows/shellcheck.yaml +++ b/.github/workflows/shellcheck.yaml @@ -8,4 +8,4 @@ jobs: uses: actions/checkout@v2 - name: Run shellcheck id: shellcheck - uses: ludeeus/action-shellcheck@0.1.0 + uses: ludeeus/action-shellcheck@1.1.0 diff --git a/backup.sh b/backup.sh index 2d845b8..0d76465 100755 --- a/backup.sh +++ b/backup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ################################################################################ # backup.sh OpenShift etcd backup script ################################################################################ @@ -70,5 +70,6 @@ rm -rv /host/var/tmp/etcd-backup if [ "${OCP_BACKUP_EXPIRE_TYPE}" = "days" ]; then find "${BACKUP_ROOTPATH}" -mindepth 1 -maxdepth 1 -type d -mtime "+${OCP_BACKUP_KEEP_DAYS}" -exec rm -rv {} + elif [ "${OCP_BACKUP_EXPIRE_TYPE}" = "count" ]; then + # shellcheck disable=SC3040,SC2012 ls -1tp "${BACKUP_ROOTPATH}" | awk "NR>${OCP_BACKUP_KEEP_COUNT}" | xargs -I{} rm -rv "${BACKUP_ROOTPATH}/{}" fi