From 06e13d0c6927e03ffefc3828757b6701b7019d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= <suwako@076.moe>
Date: Sun, 27 Aug 2023 18:58:19 +0900
Subject: [PATCH] =?UTF-8?q?076coreutils=E4=BB=A5=E5=A4=96=E3=81=AEwc?=
 =?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config_scripts/package_config.sh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/config_scripts/package_config.sh b/config_scripts/package_config.sh
index bfc7542..e19c43d 100755
--- a/config_scripts/package_config.sh
+++ b/config_scripts/package_config.sh
@@ -5,44 +5,48 @@ PACKAGECOUNT="0"
 unamestr=$(uname)
 
 if wc -v >/dev/null 2>&1; then
-  WC_COMMAND="wc -ln"
+  wc_count() {
+    wc -ln
+  }
 else
-  WC_COMMAND="wc -l'"
+  wc_count() {
+    wc -l | tr -d '[:space:]'
+  }
 fi
 
 if [ "$unamestr" = 'Linux' ]; then
   platform=$(cat /etc/os-release | grep "^ID=" | sed -e "s/ID=//")
   if [ "$platform" = 'alpine' ] || [ "$platform" = 'postmarketos' ]; then
     PACKAGEMANAGER="apk"
-    PACKAGECOUNT=$(apk info -I | $WC_COMMAND)
+    PACKAGECOUNT=$(apk info -I | wc_count)
   elif [ "$platform" = 'arch' ] || [ "$platform" = 'artix' ]; then
     PACKAGEMANAGER="pacman"
-    PACKAGECOUNT=$(pacman -Qq | $WC_COMMAND)
+    PACKAGECOUNT=$(pacman -Qq | wc_count)
   elif [ "$platform" = 'crux' ]; then
     PACKAGEMANAGER="pkginfo"
-    PACKAGECOUNT=$(pkginfo -i | $WC_COMMAND)
+    PACKAGECOUNT=$(pkginfo -i | wc_count)
   elif [ "$platform" = 'debian' ] || [ "$platform" = 'devuan' ]; then
     PACKAGEMANAGER="dpkg-query"
-    PACKAGECOUNT=$(dpkg-query -f '.\n' -W | $WC_COMMAND)
+    PACKAGECOUNT=$(dpkg-query -f '.\n' -W | wc_count)
   elif [ "$platform" = 'gentoo' ]; then
     PACKAGEMANAGER="qlist"
-    PACKAGECOUNT=$(qlist -IC | $WC_COMMAND)
+    PACKAGECOUNT=$(qlist -IC | wc_count)
   elif [ "$platform" = 'void' ]; then
     PACKAGEMANAGER="xbps-query"
-    PACKAGECOUNT=$(xbps-query -l | $WC_COMMAND)
+    PACKAGECOUNT=$(xbps-query -l | wc_count)
   fi
 elif [ "$unamestr" = 'FreeBSD' ]; then
   PACKAGEMANAGER="pkg"
-  PACKAGECOUNT=$(pkg info -a | $WC_COMMAND)
+  PACKAGECOUNT=$(pkg info -a | wc_count)
 elif [ "$unamestr" = 'OpenBSD' ]; then
   PACKAGEMANAGER="pkg_info"
-  PACKAGECOUNT=$(pkg_info | $WC_COMMAND)
+  PACKAGECOUNT=$(pkg_info | wc_count)
 elif [ "$unamestr" = 'NetBSD' ]; then
   PACKAGEMANAGER="pkg_info"
-  PACKAGECOUNT=$(pkg_info -a | $WC_COMMAND)
+  PACKAGECOUNT=$(pkg_info -a | wc_count)
 elif [ "$unamestr" = 'SunOS' ]; then
   PACKAGEMANAGER="pkg"
-  PACKAGECOUNT=$(pkg list | $WC_COMMAND)
+  PACKAGECOUNT=$(pkg list | wc_count)
 fi
 
 echo "PACKAGES='\"$PACKAGECOUNT ($PACKAGEMANAGER)\"'"