From 0e8f1ce8f09ccdaa7d128e5e03086edb4a917e6e Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Fri, 30 Jun 2023 18:38:12 +0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20chwd:=20update=20names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- archiso/airootfs/usr/local/bin/removeun | 2 +- archiso/airootfs/usr/local/bin/removeun-online | 2 +- archiso/packages_gnome.x86_64 | 2 +- archiso/packages_kde.x86_64 | 2 +- archiso/packages_openbox.x86_64 | 2 +- archiso/packages_wayfire.x86_64 | 2 +- archiso/packages_xfce.x86_64 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/archiso/airootfs/usr/local/bin/removeun b/archiso/airootfs/usr/local/bin/removeun index 4f2569d..5154a85 100755 --- a/archiso/airootfs/usr/local/bin/removeun +++ b/archiso/airootfs/usr/local/bin/removeun @@ -42,7 +42,7 @@ local _packages_to_remove=( mkinitcpio-archiso ) - local _check_nvidia_card="$(mhwd --is_nvidia_card | grep -q 'NVIDIA card found!'; echo $?)" + local _check_nvidia_card="$(chwd --is_nvidia_card | grep -q 'NVIDIA card found!'; echo $?)" if [[ "${_check_nvidia_card}" -ne 0 ]]; then echo "No NVIDIA card detected. Removing nvidia drivers" _packages_to_remove+=(nvidia-dkms nvidia-utils egl-wayland) diff --git a/archiso/airootfs/usr/local/bin/removeun-online b/archiso/airootfs/usr/local/bin/removeun-online index f3a755c..a1df016 100755 --- a/archiso/airootfs/usr/local/bin/removeun-online +++ b/archiso/airootfs/usr/local/bin/removeun-online @@ -10,7 +10,7 @@ _clean_packages() { for xx in "${_packages_to_remove[@]}"; do pacman -Rs "$xx" --noconfirm; done # making sure they are removed -# local _toberemoved_str=$'bash-completion\nxorg-xinit\nxorg-xkill\nxorg-xinput\nxorg-xrandr\nxorg-xrdb\nmkinitcpio-openswap\nalacritty\nkonsole\nkwin-scripts-forceblur\nnetworkmanager-vpnc\nnetworkmanager-qt\nnetworkmanager-openvpn\nwireguard-tools\nopenconnect\nopenvpn\nqt5-xmlpatterns\ndoxygen\ntcpdump\ndmidecode\nkparts\npolkit-qt5\nxorg-server\nxorg-apps\nqt5-tools\nzfs-utils\nlinux-cachyos-zfs\nwget\nvirtualbox-guest-utils\nxf86-video-vesa\nxf86-video-amdgpu\nxf86-video-intel\nnvidia-dkms\nnvidia-utils\nlightdm\nlightdm-gtk-greeter\nlightdm-webkit2-greeter\nbase-devel\nlinux-cachyos-headers\nplasma-browser-integration\nplasma-desktop\nplasma-firewall\nplasma-framework\nplasma-integration\nplasma-nm\nplasma-pa\nplasma-systemmonitor\nplasma-thunderbolt\nplasma-workspace\ndiscover\npackagekit-qt5\nxed\nparole\nristretto\ndolphin\ndolphin-plugins\ncapitaine-cursors\ngtk-engine-murrine\ngnome-themes-extra\nadwaita-icon-theme\nfile-roller\nlibwnck3\nnetwork-manager-applet\ngalculator\ncachy-browser\nkvantum-qt5\nqt5ct\nneofetch\nopen-vm-tools\nxf86-input-vmmouse\nxf86-video-vmware\ncachyos-kde-settings\ncachyos-picom-config\ncachyos-rate-mirrors\ncachyos-kernel-manager\nmhwd-nvidia-390xx\nmhwd-cachyos\noctopi\nreflector-simple\nmeld\nparu\nnordic-theme-git\nlightly-git\ncachyos-nord-kde-theme-git\nchar-white' +# local _toberemoved_str=$'bash-completion\nxorg-xinit\nxorg-xkill\nxorg-xinput\nxorg-xrandr\nxorg-xrdb\nmkinitcpio-openswap\nalacritty\nkonsole\nkwin-scripts-forceblur\nnetworkmanager-vpnc\nnetworkmanager-qt\nnetworkmanager-openvpn\nwireguard-tools\nopenconnect\nopenvpn\nqt5-xmlpatterns\ndoxygen\ntcpdump\ndmidecode\nkparts\npolkit-qt5\nxorg-server\nxorg-apps\nqt5-tools\nzfs-utils\nlinux-cachyos-zfs\nwget\nvirtualbox-guest-utils\nxf86-video-vesa\nxf86-video-amdgpu\nxf86-video-intel\nnvidia-dkms\nnvidia-utils\nlightdm\nlightdm-gtk-greeter\nlightdm-webkit2-greeter\nbase-devel\nlinux-cachyos-headers\nplasma-browser-integration\nplasma-desktop\nplasma-firewall\nplasma-framework\nplasma-integration\nplasma-nm\nplasma-pa\nplasma-systemmonitor\nplasma-thunderbolt\nplasma-workspace\ndiscover\npackagekit-qt5\nxed\nparole\nristretto\ndolphin\ndolphin-plugins\ncapitaine-cursors\ngtk-engine-murrine\ngnome-themes-extra\nadwaita-icon-theme\nfile-roller\nlibwnck3\nnetwork-manager-applet\ngalculator\ncachy-browser\nkvantum-qt5\nqt5ct\nneofetch\nopen-vm-tools\nxf86-input-vmmouse\nxf86-video-vmware\ncachyos-kde-settings\ncachyos-picom-config\ncachyos-rate-mirrors\ncachyos-kernel-manager\nchwd\noctopi\nreflector-simple\nmeld\nparu\nnordic-theme-git\nlightly-git\ncachyos-nord-kde-theme-git\nchar-white' # local _toberemoved_packages # readarray -t _toberemoved_packages <<< "$_toberemoved_str" # local xxx diff --git a/archiso/packages_gnome.x86_64 b/archiso/packages_gnome.x86_64 index e4efdef..cd08dbb 100644 --- a/archiso/packages_gnome.x86_64 +++ b/archiso/packages_gnome.x86_64 @@ -150,7 +150,7 @@ mdadm memtest86+ memtest86+-efi mesa -mhwd-cachyos +chwd mkinitcpio mkinitcpio-archiso mkinitcpio-nfs-utils diff --git a/archiso/packages_kde.x86_64 b/archiso/packages_kde.x86_64 index a34ed91..546c319 100644 --- a/archiso/packages_kde.x86_64 +++ b/archiso/packages_kde.x86_64 @@ -117,7 +117,7 @@ mdadm memtest86+ memtest86+-efi mesa -mhwd-cachyos +chwd micro mkinitcpio mkinitcpio-archiso diff --git a/archiso/packages_openbox.x86_64 b/archiso/packages_openbox.x86_64 index 27b9820..8317680 100644 --- a/archiso/packages_openbox.x86_64 +++ b/archiso/packages_openbox.x86_64 @@ -129,7 +129,7 @@ meld memtest86+ mesa mesa-utils -mhwd-cachyos +chwd mkinitcpio mkinitcpio-archiso mkinitcpio-nfs-utils diff --git a/archiso/packages_wayfire.x86_64 b/archiso/packages_wayfire.x86_64 index 2e9bf3e..8af121b 100644 --- a/archiso/packages_wayfire.x86_64 +++ b/archiso/packages_wayfire.x86_64 @@ -129,7 +129,7 @@ meld memtest86+ mesa mesa-utils -mhwd-cachyos +chwd mkinitcpio mkinitcpio-archiso mkinitcpio-nfs-utils diff --git a/archiso/packages_xfce.x86_64 b/archiso/packages_xfce.x86_64 index 8f02b4f..1bfdeb8 100644 --- a/archiso/packages_xfce.x86_64 +++ b/archiso/packages_xfce.x86_64 @@ -132,7 +132,7 @@ meld memtest86+ mesa mesa-utils -mhwd-cachyos +chwd mkinitcpio mkinitcpio-archiso mkinitcpio-nfs-utils