From 1079a2d73591245a6f94a00f47f737eacac534cf Mon Sep 17 00:00:00 2001
From: hayao <shun819.mail@gmail.com>
Date: Sun, 27 Sep 2020 11:25:41 +0900
Subject: [PATCH] [update] : Use cut instead of awk (build.sh)

---
 build.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index 8ba7ecca..84c69eb6 100755
--- a/build.sh
+++ b/build.sh
@@ -191,6 +191,13 @@ msg_error() {
 }
 
 
+# Usage: getclm <number>
+# 標準入力から値を受けとり、引数で指定された列を抽出します。
+getclm() {
+    echo "$(cat -)" | cut -d " " -f "${1}"
+}
+
+
 _usage () {
     echo "usage ${0} [options] [channel]"
     echo
@@ -233,7 +240,7 @@ _usage () {
         for i in $( seq 1 $(( ${blank} - 4 - ${#_arch} )) ); do
             echo -ne " "
         done
-        _locale_name_list=$(cat ${_list} | grep -h -v ^'#' | awk '{print $1}')
+        _locale_name_list=$(cat ${_list} | grep -h -v ^'#' | getclm 1)
         for _lang in ${_locale_name_list[@]};do
             echo -n "${_lang} "
         done
@@ -246,7 +253,7 @@ _usage () {
         _arch="${_list#${script_path}/system/kernel-}"
         echo -n "    ${_arch} "
         for i in $( seq 1 $(( ${blank} - 5 - ${#_arch} )) ); do echo -ne " "; done
-        for kernel in $(grep -h -v ^'#' ${_list} | awk '{print $1}'); do echo -n "${kernel} "; done
+        for kernel in $(grep -h -v ^'#' ${_list} | getclm 1); do echo -n "${kernel} "; done
         echo
     done
 
@@ -576,7 +583,7 @@ prepare_build() {
 
     # Check packages
     if [[ "${nodepend}" = false ]] && [[ "${arch}" = $(uname -m) ]] ; then
-        local _installed_pkg=($(pacman -Q | awk '{print $1}')) _installed_ver=($(pacman -Q | awk '{print $2}')) _check_pkg _check_failed=false _pkg
+        local _installed_pkg=($(pacman -Q | getclm 1)) _installed_ver=($(pacman -Q | awk '{print $2}')) _check_pkg _check_failed=false _pkg
         msg_info "Checking dependencies ..."
 
         # _checl_pkg [package]
@@ -641,7 +648,7 @@ prepare_build() {
             msg_error "Probably the system kernel has been updated."
             msg_error "Reboot your system to run the latest kernel." "1"
         fi
-        if [[ -z "$(lsmod | awk '{print $1}' | grep -x "loop")" ]]; then modprobe loop; fi
+        if [[ -z "$(lsmod | getclm 1 | grep -x "loop")" ]]; then modprobe loop; fi
     fi
 }
 
@@ -1271,7 +1278,7 @@ parse_files() {
 
     # 選択されたロケールの設定が描かれた行番号を取得
     _locale_config_file="${script_path}/system/locale-${arch}"
-    _locale_name_list=($(cat "${_locale_config_file}" | grep -h -v ^'#' | awk '{print $1}'))
+    _locale_name_list=($(cat "${_locale_config_file}" | grep -h -v ^'#' | getclm 1))
     _get_locale_line_number() {
         local _lang _count=0
         for _lang in ${_locale_name_list[@]}; do
@@ -1302,7 +1309,7 @@ parse_files() {
 
     # 選択されたカーネルの設定が描かれた行番号を取得
     _kernel_config_file="${script_path}/system/kernel-${arch}"
-    _kernel_name_list=($(cat "${_kernel_config_file}" | grep -h -v ^'#' | awk '{print $1}'))
+    _kernel_name_list=($(cat "${_kernel_config_file}" | grep -h -v ^'#' | getclm 1))
     _get_kernel_line() {
         local _kernel _count=0
         for _kernel in ${_kernel_name_list[@]}; do
-- 
2.11.0