From f7891ac366db465c95749524f16577f97cc09efa Mon Sep 17 00:00:00 2001 From: Ben Kohler Date: Wed, 12 Aug 2020 10:43:54 -0500 Subject: [PATCH] tools/catalyst-auto-{amd64,x86}.conf: fix update_symlinks globbing Signed-off-by: Ben Kohler --- tools/catalyst-auto-amd64.conf | 3 ++- tools/catalyst-auto-x86.conf | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 4289f036..9a05319c 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -41,12 +41,13 @@ SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec h KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH} -EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]" +EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)" update_symlinks() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do pushd "${d}" >/dev/null || exit + shopt -s extglob for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do # 20yymmddThhmmssZ # 20yymmddhhmmss diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index c6f4a694..db4c2143 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -28,12 +28,13 @@ SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH} -EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]" +EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)" update_symlinks() { # Symlink the latest stages3 to build from for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do pushd "${d}" >/dev/null || exit + shopt -s extglob for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do # 20yymmddThhmmssZ # 20yymmddhhmmss