From d3de89927f17bdb3763b2da4ca46c0c75cebc68f Mon Sep 17 00:00:00 2001
From: hayao <hayao@fascode.net>
Date: Fri, 5 Mar 2021 15:01:42 +0900
Subject: [PATCH] [fix] : Fixed share package list

---
 build.sh         |  4 ----
 tools/pkglist.sh | 29 ++++++-----------------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/build.sh b/build.sh
index fbff75ad..29845f8d 100755
--- a/build.sh
+++ b/build.sh
@@ -541,7 +541,6 @@ make_packages_repo() {
 
     # get pkglist
     if [[ "${boot_splash}"   = true ]]; then _pkglist_args+=" -b"; fi
-    if [[ "${include_extra}" = true ]]; then _pkglist_args+=" -e"; fi
     if [[ "${debug}"         = true ]]; then _pkglist_args+=" -d"; fi
     if [[ "${memtest86}"     = true ]]; then _pkglist_args+=" -m"; fi
     _pkgbuild_dirs+=" ${modules[*]}"
@@ -563,9 +562,6 @@ make_packages_aur() {
     if [[ "${boot_splash}" = true ]]; then
         _pkglist_args+=" -b"
     fi
-    if [[ "${include_extra}" = true ]]; then
-        _pkglist_args+=" -e"
-    fi
     if [[ "${debug}" = true ]]; then
         _pkglist_args+=" -d"
     fi
diff --git a/tools/pkglist.sh b/tools/pkglist.sh
index 902c92b3..a25ce8da 100755
--- a/tools/pkglist.sh
+++ b/tools/pkglist.sh
@@ -9,7 +9,6 @@ modules=()
 boot_splash=false
 aur=false
 pkgdir_name="packages"
-extra=false
 line=false
 debug=false
 memtest86=false
@@ -30,7 +29,6 @@ _help() {
     echo "    -b | --boot-splash        Enable boot splash"
     echo "    -c | --channel [dir]      Specify the channel directory"
     echo "    -d | --debug              Enable debug message"
-    echo "    -e | --extra              Include extra packages"
     echo "    -k | --kernel [kernel]    Specify the kernel"
     echo "    -l | --locale [locale]    Specify the locale"
     echo "    -m | --memtest86          Enable memtest86 package"
@@ -73,8 +71,8 @@ msg_debug() {
 
 # Parse options
 ARGUMENT="${@}"
-opt_short="a:bc:dek:l:mh"
-opt_long="arch:,boot-splash,channel:,debug,extra,kernel:,locale:,memtest86,aur,help,line"
+opt_short="a:bc:dk:l:mh"
+opt_long="arch:,boot-splash,channel:,debug,kernel:,locale:,memtest86,aur,help,line"
 if ! OPT=$(getopt -o ${opt_short} -l ${opt_long} -- ${ARGUMENT}); then
     exit 1
 fi
@@ -100,10 +98,6 @@ while true; do
             debug=true
             shift 1
             ;;
-        -e | --extra)
-            extra=true
-            shift 1
-            ;;
         -k | --kernel)
             kernel="${2}"
             shift 2
@@ -179,26 +173,15 @@ for_module '_loadfilelist+=(${module_dir}/{}/${pkgdir_name}.${arch}/kernel/${ker
 
 # Plymouth package list
 if [[ "${boot_splash}" = true ]]; then
-    _loadfilelist+=(
-        $(ls ${share_dir}/${pkgdir_name}.${arch}/plymouth/*.${arch} 2> /dev/null)
-        $(ls ${channel_dir}/${pkgdir_name}.${arch}/plymouth/*.${arch} 2> /dev/null)
-    )
-
+    _loadfilelist+=($(ls ${channel_dir}/${pkgdir_name}.${arch}/plymouth/*.${arch} 2> /dev/null))
     for_module '_loadfilelist+=($(ls ${module_dir}/{}/${pkgdir_name}.${arch}/plymouth/*.${arch} 2> /dev/null))'
 fi
 
 # memtest86 package list
 if [[ "${memtest86}" = true ]]; then
-    _loadfilelist+=(
-        $(ls ${share_dir}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null)
-        $(ls ${channel_dir}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null)
-    )
-
-    if [[ "${extra}" = true ]]; then
-        _loadfilelist+=(
-            $(ls ${extra_dir}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null)
-        )
-    fi
+    _loadfilelist+=($(ls ${channel_dir}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null))
+
+    for_module '_loadfilelist+=($(ls ${module_dir}/{}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null))'
 fi
 
 #-- Read package list --#
-- 
2.11.0