From fe9044b32d948b54470f6742f83cb85bdd588449 Mon Sep 17 00:00:00 2001 From: Robert Allen Date: Fri, 27 Jun 2014 22:05:59 -0500 Subject: [PATCH] Address amazon linux not being found the `./` prevent the script from recognizing the Amazon Linux release ``diff --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -703,7 +703,7 @@ __gather_linux_system_info() { # shellcheck disable=SC2086 for rsource in $(__sort_release_files "$( - cd /etc && /bin/ls ./*[_-]release ./*[_-]version 2>/dev/null | env -i sort | \ + cd /etc && /bin/ls *[_-]release *[_-]version 2>/dev/null | env -i sort | \ sed -e '/^redhat-release$/d' -e '/^lsb-release$/d'; \ echo redhat-release lsb-release )"); do ``` ``` + n=./system ++ sed -e q ++ grep '[0-9]' ++ grep VERSION /etc/./system-release ++ cat /etc/./system-release + rv='Amazon Linux AMI release 2014.03' + '[' 'Amazon Linux AMI release 2014.03' = '' ']' ++ __parse_version_string 'Amazon Linux AMI release 2014.03' ++ VERSION_STRING='Amazon Linux AMI release 2014.03' +++ echo 'Amazon Linux AMI release 2014.03' +++ sed -e 's/^/#/' -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\)\(\.[0-9][0-9]*\).*$/\1/' -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' -e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' -e 's/^#.*$//' ++ PARSED_VERSION=2014.03 ++ echo 2014.03 + v=2014.03 + case $(echo "${n}" | tr '[:upper:]' '[:lower:]') in ++ echo ./system ++ tr '[:upper:]' '[:lower:]' + n=./system + DISTRO_NAME=./system + DISTRO_VERSION=2014.03 ``` --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 2916371..04aac9d 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -704,7 +704,7 @@ __gather_linux_system_info() { # shellcheck disable=SC2086 for rsource in $(__sort_release_files "$( - cd /etc && /bin/ls ./*[_-]release ./*[_-]version 2>/dev/null | env -i sort | \ + cd /etc && /bin/ls *[_-]release *[_-]version 2>/dev/null | env -i sort | \ sed -e '/^redhat-release$/d' -e '/^lsb-release$/d'; \ echo redhat-release lsb-release )"); do