From 437f1ead5b7d38ac8fbb6ce5394db8ce5633657a Mon Sep 17 00:00:00 2001 From: Alejandro Date: Sun, 1 Nov 2020 17:37:49 +0000 Subject: [PATCH] allow bash 5.x on the host Signed-off-by: Alejandro Mery --- bin/sde-check-system | 3 ++- lib/functions.in | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/sde-check-system b/bin/sde-check-system index c6717e1..13b3011 100755 --- a/bin/sde-check-system +++ b/bin/sde-check-system @@ -3,7 +3,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: bin/sde-check-system -# Copyright (C) 2006 - 2013 The OpenSDE Project +# Copyright (C) 2006 - 2020 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -136,6 +136,7 @@ case $BASH_VERSION in 2.05b*) ;; 3.*) ;; 4.*) ;; + 5.*) ;; *) cat <<-EOT Paranoia Check: Invalid 'bash' version ($BASH_VERSION) The running bash version is not listed as supported version diff --git a/lib/functions.in b/lib/functions.in index f6eb0ad..b8a0784 100644 --- a/lib/functions.in +++ b/lib/functions.in @@ -37,7 +37,7 @@ get_unique() { # this functions expands an string replacing % with all possible values # listed after case "$BASH_VERSION" in # damn workaround for different syntax in both versions - 2*) +2.*) get_expanded() { local string="$1"; shift while [ $# -gt 0 ]; do @@ -46,7 +46,7 @@ get_expanded() { done } ;; -3*|4*) +3.*|4.*|5.*) get_expanded() { local string="$1"; shift while [ $# -gt 0 ]; do -- 2.25.1