From c6b63cf94b98cc94b765e00b2598618b86557553 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Tue, 30 May 2023 13:00:08 -0400 Subject: [PATCH 1/6] Fixed issue #455-lowercasing checks on both sides --- yadm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yadm b/yadm index 003d954..a7a0c11 100755 --- a/yadm +++ b/yadm @@ -204,6 +204,7 @@ function score_file() { return fi elif [[ "$label" =~ ^(d|distro)$ ]]; then + value=${value,,} if [ "${value/\ /_}" = "${local_distro/\ /_}" ]; then score=$((score + 4)) else @@ -211,6 +212,7 @@ function score_file() { return fi elif [[ "$label" =~ ^(f|distro_family)$ ]]; then + value=${value,,} if [ "${value/\ /_}" = "${local_distro_family/\ /_}" ]; then score=$((score + 8)) else @@ -1522,7 +1524,7 @@ function query_distro() { fi done < "$OS_RELEASE" fi - echo "$distro" + echo "${distro,,}" } function query_distro_family() { @@ -1536,7 +1538,7 @@ function query_distro_family() { fi done < "$OS_RELEASE" fi - echo "$family" + echo "${family,,}" } function process_global_args() { From 6d305b2b804d4c258fd1533d876d601d08b8a278 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Tue, 30 May 2023 13:39:42 -0400 Subject: [PATCH 2/6] Fixed issue #455-lowercasing checks on both sides - More POSIX friendly --- yadm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yadm b/yadm index a7a0c11..f2157fe 100755 --- a/yadm +++ b/yadm @@ -204,7 +204,7 @@ function score_file() { return fi elif [[ "$label" =~ ^(d|distro)$ ]]; then - value=${value,,} + value=$(echo $value | tr '[:upper:]' '[:lower:]') if [ "${value/\ /_}" = "${local_distro/\ /_}" ]; then score=$((score + 4)) else @@ -212,7 +212,7 @@ function score_file() { return fi elif [[ "$label" =~ ^(f|distro_family)$ ]]; then - value=${value,,} + value=$(echo $value | tr '[:upper:]' '[:lower:]') if [ "${value/\ /_}" = "${local_distro_family/\ /_}" ]; then score=$((score + 8)) else @@ -1524,7 +1524,7 @@ function query_distro() { fi done < "$OS_RELEASE" fi - echo "${distro,,}" + echo "$distro" | tr '[:upper:]' '[:lower:]' } function query_distro_family() { @@ -1538,7 +1538,7 @@ function query_distro_family() { fi done < "$OS_RELEASE" fi - echo "${family,,}" + echo "$family" | tr '[:upper:]' '[:lower:]' } function process_global_args() { From 630b677269dc1c52089e4258d7c0aefadff84b67 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Tue, 30 May 2023 13:40:51 -0400 Subject: [PATCH 3/6] Fixed issue #455-lowercasing checks on both sides - More POSIX friendly --- yadm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yadm b/yadm index f2157fe..fca257e 100755 --- a/yadm +++ b/yadm @@ -204,7 +204,7 @@ function score_file() { return fi elif [[ "$label" =~ ^(d|distro)$ ]]; then - value=$(echo $value | tr '[:upper:]' '[:lower:]') + value="$(echo $value | tr '[:upper:]' '[:lower:]')" if [ "${value/\ /_}" = "${local_distro/\ /_}" ]; then score=$((score + 4)) else @@ -212,7 +212,7 @@ function score_file() { return fi elif [[ "$label" =~ ^(f|distro_family)$ ]]; then - value=$(echo $value | tr '[:upper:]' '[:lower:]') + value="$(echo $value | tr '[:upper:]' '[:lower:]')" if [ "${value/\ /_}" = "${local_distro_family/\ /_}" ]; then score=$((score + 8)) else From a72c566da8eaf53d9ce232772405a9ec1474d1fa Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Tue, 30 May 2023 16:50:47 -0400 Subject: [PATCH 4/6] Fixed issue #455-lowercasing checks on both sides - More POSIX friendly 2 --- yadm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/yadm b/yadm index fca257e..faa4080 100755 --- a/yadm +++ b/yadm @@ -204,7 +204,7 @@ function score_file() { return fi elif [[ "$label" =~ ^(d|distro)$ ]]; then - value="$(echo $value | tr '[:upper:]' '[:lower:]')" + value=$(echo "$value" | "${AWK_PROGRAM[0]}" '{print tolower($0)}') if [ "${value/\ /_}" = "${local_distro/\ /_}" ]; then score=$((score + 4)) else @@ -212,7 +212,7 @@ function score_file() { return fi elif [[ "$label" =~ ^(f|distro_family)$ ]]; then - value="$(echo $value | tr '[:upper:]' '[:lower:]')" + value=$(echo "$value" | "${AWK_PROGRAM[0]}" '{print tolower($0)}') if [ "${value/\ /_}" = "${local_distro_family/\ /_}" ]; then score=$((score + 8)) else @@ -1524,7 +1524,7 @@ function query_distro() { fi done < "$OS_RELEASE" fi - echo "$distro" | tr '[:upper:]' '[:lower:]' + echo "$distro" | "${AWK_PROGRAM[0]}" '{print tolower($0)}' } function query_distro_family() { @@ -1535,10 +1535,13 @@ function query_distro_family() { family="${line#ID_LIKE=}" family="${family//\"}" break + elif [[ -z "$family" && "$line" = ID=* ]]; then + family="${line#ID=}" + family="${family//\"}" fi done < "$OS_RELEASE" fi - echo "$family" | tr '[:upper:]' '[:lower:]' + echo "$distro" | "${AWK_PROGRAM[0]}" '{print tolower($0)}' } function process_global_args() { From 8bfc09c0d8e89265c70e065b761780d21cfab620 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Tue, 30 May 2023 23:07:14 -0400 Subject: [PATCH 5/6] Fixed issue #455-lowercasing checks on both sides - More POSIX friendly 3 --- yadm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/yadm b/yadm index faa4080..9cfa44e 100755 --- a/yadm +++ b/yadm @@ -204,7 +204,8 @@ function score_file() { return fi elif [[ "$label" =~ ^(d|distro)$ ]]; then - value=$(echo "$value" | "${AWK_PROGRAM[0]}" '{print tolower($0)}') + #value=$(echo "$value" | "${AWK_PROGRAM[0]}" '{print tolower($0)}') # FIXME Remove + value=$("${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$value") if [ "${value/\ /_}" = "${local_distro/\ /_}" ]; then score=$((score + 4)) else @@ -212,7 +213,8 @@ function score_file() { return fi elif [[ "$label" =~ ^(f|distro_family)$ ]]; then - value=$(echo "$value" | "${AWK_PROGRAM[0]}" '{print tolower($0)}') + #value=$(echo "$value" | "${AWK_PROGRAM[0]}" '{print tolower($0)}') # FIXME Remove + value=$("${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$value") if [ "${value/\ /_}" = "${local_distro_family/\ /_}" ]; then score=$((score + 8)) else @@ -1524,7 +1526,8 @@ function query_distro() { fi done < "$OS_RELEASE" fi - echo "$distro" | "${AWK_PROGRAM[0]}" '{print tolower($0)}' + #echo "$distro" | "${AWK_PROGRAM[0]}" '{print tolower($0)}' ## FIXME Remove + "${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$distro" } function query_distro_family() { @@ -1541,7 +1544,8 @@ function query_distro_family() { fi done < "$OS_RELEASE" fi - echo "$distro" | "${AWK_PROGRAM[0]}" '{print tolower($0)}' + #echo "$distro" | "${AWK_PROGRAM[0]}" '{print tolower($0)}' ## FIXME Remove + "${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$distro" } function process_global_args() { From 9f852c1ad401199d8dc2bb28d837258556ebda7e Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Tue, 30 May 2023 23:17:59 -0400 Subject: [PATCH 6/6] Fixed issue #455-lowercasing checks on both sides - More POSIX friendly 4 --- yadm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yadm b/yadm index 9cfa44e..1f4e9a2 100755 --- a/yadm +++ b/yadm @@ -204,7 +204,6 @@ function score_file() { return fi elif [[ "$label" =~ ^(d|distro)$ ]]; then - #value=$(echo "$value" | "${AWK_PROGRAM[0]}" '{print tolower($0)}') # FIXME Remove value=$("${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$value") if [ "${value/\ /_}" = "${local_distro/\ /_}" ]; then score=$((score + 4)) @@ -213,7 +212,6 @@ function score_file() { return fi elif [[ "$label" =~ ^(f|distro_family)$ ]]; then - #value=$(echo "$value" | "${AWK_PROGRAM[0]}" '{print tolower($0)}') # FIXME Remove value=$("${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$value") if [ "${value/\ /_}" = "${local_distro_family/\ /_}" ]; then score=$((score + 8)) @@ -1526,7 +1524,6 @@ function query_distro() { fi done < "$OS_RELEASE" fi - #echo "$distro" | "${AWK_PROGRAM[0]}" '{print tolower($0)}' ## FIXME Remove "${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$distro" } @@ -1544,7 +1541,6 @@ function query_distro_family() { fi done < "$OS_RELEASE" fi - #echo "$distro" | "${AWK_PROGRAM[0]}" '{print tolower($0)}' ## FIXME Remove "${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$distro" }