From 4caadf77be6ff4aee6cc23e839d2bf5c6559732e Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Sat, 5 Aug 2023 12:14:04 -0500 Subject: [PATCH] Revert "Merge pull request #456 from erenfro/master" This reverts commit fdfff9465b0c8cd2ce27f47eca6315e0868ad0d7, reversing changes made to 76ce3defea0e69c3e8130e7cfdcd22b64322aea2. --- yadm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/yadm b/yadm index 67b903f..09da278 100755 --- a/yadm +++ b/yadm @@ -204,7 +204,6 @@ function score_file() { return fi elif [[ "$label" =~ ^(d|distro)$ ]]; then - value=$("${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$value") if [ "${value/\ /_}" = "${local_distro/\ /_}" ]; then score=$((score + 4)) else @@ -212,7 +211,6 @@ function score_file() { return fi elif [[ "$label" =~ ^(f|distro_family)$ ]]; then - value=$("${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$value") if [ "${value/\ /_}" = "${local_distro_family/\ /_}" ]; then score=$((score + 8)) else @@ -1524,7 +1522,7 @@ function query_distro() { fi done < "$OS_RELEASE" fi - "${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$distro" + echo "$distro" } function query_distro_family() { @@ -1535,13 +1533,10 @@ 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 - "${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$distro" + echo "$family" } function process_global_args() {