From c4b0d115cc5e396f448c24774de5d7bd5d3800dc Mon Sep 17 00:00:00 2001
From: hayao <shun819.mail@gmail.com>
Date: Sun, 2 Aug 2020 22:08:19 +0900
Subject: [PATCH] [update] : kernel var localize

---
 build.sh | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/build.sh b/build.sh
index be475baf..38a28b55 100755
--- a/build.sh
+++ b/build.sh
@@ -509,14 +509,6 @@ prepare_build() {
         save_var password
         save_var usershell
 
-        write_rebuild_file "\n# Kernel Info"
-        save_var kernel
-        save_var kernel_package
-        save_var kernel_headers_packages
-        save_var kernel_filename
-        save_var kernel_mkinitcpio_profile
-        save_var kernel_line
-
         write_rebuild_file "\n# Plymouth Info"
         save_var boot_splash
         save_var theme_name
@@ -528,6 +520,13 @@ prepare_build() {
         save_var locale_time
         save_var locale_version
 
+        write_rebuild_file "\n# Kernel Info"
+        save_var kernel
+        save_var kernel_package
+        save_var kernel_headers_packages
+        save_var kernel_filename
+        save_var kernel_mkinitcpio_profile
+
         write_rebuild_file "\n# Squashfs Info"
         save_var sfs_comp
         save_var sfs_comp_opt
@@ -1253,11 +1252,11 @@ parse_files() {
 
 
     # Parse kernel
-    local 
+    local _kernel_config_file _kernel_name_list _kernel_line _get_kernel_line
 
     _kernel_config_file="${script_path}/system/kernel-${arch}"
     _kernel_name_list=($(cat "${_kernel_config_file}" | grep -h -v ^'#' | awk '{print $1}'))
-    get_kernel_line() {
+    _get_kernel_line() {
         local _kernel
         local count
         count=0
@@ -1271,12 +1270,12 @@ parse_files() {
         echo -n "failed"
         return 0
     }
-    kernel_line="$(get_kernel_line)"
-    if [[ "${kernel_line}" == "failed" ]]; then
+    _kernel_line="$(_get_kernel_line)"
+    if [[ "${_kernel_line}" == "failed" ]]; then
         _msg_error "Invalid kernel ${kernel}" "1"
     fi
 
-    _kernel_config_line="$(cat "${_kernel_config_file}" | grep -h -v ^'#' | grep -v ^$ | head -n "${kernel_line}" | tail -n 1)"
+    _kernel_config_line="$(cat "${_kernel_config_file}" | grep -h -v ^'#' | grep -v ^$ | head -n "${_kernel_line}" | tail -n 1)"
 
     kernel=$(echo ${_kernel_config_line} | awk '{print $1}')
     kernel_package=$(echo ${_kernel_config_line} | awk '{print $2}')
-- 
2.11.0