Date: Friday, January 28, 2022 @ 17:31:54 Author: tpowa Revision: 435317
upgpkg: hwdetect 2022.01-5: small cleanup Modified: hwdetect/trunk/PKGBUILD hwdetect/trunk/hwdetect ----------+ PKGBUILD | 4 ++-- hwdetect | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-28 17:20:31 UTC (rev 435316) +++ PKGBUILD 2022-01-28 17:31:54 UTC (rev 435317) @@ -1,7 +1,7 @@ # Maintainer: Tobias Powalowski <[email protected]> pkgname=hwdetect pkgver=2022.01 -pkgrel=4 +pkgrel=5 pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf" arch=(any) url="https://archlinux.org/packages/extra/any/hwdetect/"; @@ -12,7 +12,7 @@ 'lvm2: for lvm2 mkinitcpio config support' 'mdadm: for raid mkinitcpio config support') source=(hwdetect) -sha512sums=('0c53f8b18c3ba88af0a0d972118ca56d4c58254255c5976bf7ceb64f93e3ad47292eb6456c923a08b6a80fe1b4f6cffe94264998a8a042687f666d0e863b8049') +sha512sums=('b0ebbc167b93cfcd881ce6a69f3ac337f7f22d9879a67e439f4d5af3b3622aa0d7656103fb7d550a6c6da1f95bc1393a0cb870b349ad05ff168d901c890e59c4') package() { install -D -m 755 "${srcdir}/hwdetect" "${pkgdir}/usr/bin/hwdetect" Modified: hwdetect =================================================================== --- hwdetect 2022-01-28 17:20:31 UTC (rev 435316) +++ hwdetect 2022-01-28 17:31:54 UTC (rev 435317) @@ -1,6 +1,6 @@ #! /bin/bash # Autodetection script for scanning /sys for hardware -# for Archlinux by Tobias Powalowski <[email protected]> +# for Arch Linux by Tobias Powalowski <[email protected]> _SHOW_MODULES="" _SHOW_HOOKS="" @@ -131,7 +131,7 @@ ADVANCED="" # root device check if ! [ "$ROOTDEVICE" = "" ]; then - ADVANCED="$(echo $(echo "$(lsblk -rpsno TYPE $ROOTDEVICE | grep -ve "disk" -e "part")" | tac) | sed -e 's#crypt#encrypt#g' -e 's#raid.*[0-9]#mdadm_udev#g' -e 's#lvm#lvm2#g')" + ADVANCED="$(echo $(echo "$(lsblk -rpsno TYPE $ROOTDEVICE | grep -vwe "disk" -we "part")" | tac) | sed -e 's#crypt#encrypt#g' -e 's#raid.*[0-9]#mdadm_udev#g' -e 's#lvm#lvm2#g')" fi : >/tmp/modules-plain @@ -205,12 +205,12 @@ showlist "IRDA " $(listmods irda/) showlist "KVM " $(listmods kvm/) showlist "MEDIA " $(listmods media/) - showlist "MEI " $(listmods mei/) + showlist "MEI " $(listmods mei/) showlist "MFD " $(listmods mfd/) showlist "MTD " $(listmods mtd/) showlist "NET " $(listmods net/ irda/) showlist "PARPORT " $(listmods parport/) - showlist "PLATFORM " $(listmods platform/) + showlist "PLATFORM " $(listmods platform/) showlist "POWERCAP " $(listmods powercap/) showlist "SERIAL " $(listmods serial/) showlist "SOUND " $(listmods pcspkr) $(listmods sound/) @@ -224,11 +224,9 @@ usb/ ieee1394 bluetooth/ cdrom/ cpufreq/ crypto/ dca/ dma/ edac/ events/ net/ hwmon/ i2c/ input/ ipmi/ irda/ kvm/ mac_hid media/ mei/ \ mfd/ mtd/ parport/ platform/ powercap/ sound/ thermal/ tpm/ drm/ firewire/ hid/ serial/ staging/ video/ virt/ watchdog/) ;; - --show-modules-order) showlist "MODULES ORDER" $(listmods modules/) ;; - --show-agp) showlist "AGP " $(listmods agp/) ;; --show-acpi) showlist "ACPI " $(listmods acpi/) ;; --show-block) showlist "BLOCK " $(listmods ata/pata pata_acpi) $(listmods ata/ata_piix) \
