diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-08-01 15:48:43 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-08-01 22:35:00 +0200 |
| commit | c8624437130d318d93596453d0057f8fdfbe1ed2 (patch) | |
| tree | 0cebf1236b99fe28daf6c4693b3af9349ccbe881 /gen_package.sh | |
| parent | genkernel: Move grep/zgrep check to determine_real_args() (diff) | |
| download | genkernel-c8624437130d318d93596453d0057f8fdfbe1ed2.tar.gz genkernel-c8624437130d318d93596453d0057f8fdfbe1ed2.tar.bz2 genkernel-c8624437130d318d93596453d0057f8fdfbe1ed2.zip | |
Unify 'confgrep' handling via new get_grep_cmd_for_file() function
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'gen_package.sh')
| -rwxr-xr-x | gen_package.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gen_package.sh b/gen_package.sh index aad52de0..271f0382 100755 --- a/gen_package.sh +++ b/gen_package.sh @@ -259,14 +259,8 @@ gen_kerncache_is_valid() { local test1=$(grep -v "^#" "${TEMP}/${GK_FILENAME_TEMP_CONFIG}" | md5sum | cut -d " " -f 1) fi - if isTrue "$(is_gzipped "${KERNEL_CONFIG}")" - then - # Support --kernel-config=/proc/config.gz, mainly - local CONFGREP=zgrep - else - local CONFGREP=grep - fi - local test2=$("${CONFGREP}" -v "^#" "${KERNEL_CONFIG}" | md5sum | cut -d " " -f 1) + local confgrep_cmd=$(get_grep_cmd_for_file "${KERNEL_CONFIG}") + local test2=$("${confgrep_cmd}" -v "^#" "${KERNEL_CONFIG}" | md5sum | cut -d " " -f 1) if [[ "${test1}" == "${test2}" ]] then |