diff --git a/CHANGELOG.md b/CHANGELOG.md index fbc11c7..817517d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Add mpv for HDR video playback. - Add ckb-next for supporting RGB on Corsair keyboards and mice. - Change winesapOS testing repository to be a rolling updates repository. +- Change 'asusctl-git' package to use the 'asusctl' package instead. ## 4.3.0 - The Wayland Update diff --git a/UPGRADES.md b/UPGRADES.md index 768adc2..b50e44b 100644 --- a/UPGRADES.md +++ b/UPGRADES.md @@ -9,6 +9,7 @@ **No Action Required:** - Change the winesapOS stable repository to be the winesapOS rolling updates repository. +- Change 'asusctl-git' package to use the 'asusctl' package instead. ## 4.2.0 to 4.3.0 diff --git a/scripts/repo/winesapos-build-repo.sh b/scripts/repo/winesapos-build-repo.sh index 70ea159..813d444 100755 --- a/scripts/repo/winesapos-build-repo.sh +++ b/scripts/repo/winesapos-build-repo.sh @@ -66,8 +66,6 @@ git config --global user.email "you@example.com" git config --global user.name "Your Name" makepkg_fn apfsprogs-git -makepkg_fn asusctl-git -# AYANEO drivers. makepkg_fn ayaneo-platform-dkms-git makepkg_fn ayaled-updated makepkg_fn ceph-bin diff --git a/scripts/winesapos-setup.sh b/scripts/winesapos-setup.sh index 5023004..80eb251 100755 --- a/scripts/winesapos-setup.sh +++ b/scripts/winesapos-setup.sh @@ -251,7 +251,7 @@ asus_setup() { if sudo dmidecode -s system-manufacturer | grep -P "^ASUS"; then echo "ASUS computer detected." kdialog_dbus=$(kdialog --title "winesapOS First-Time Setup" --progressbar "Please wait for ASUS utilities to be installed..." 1 | cut -d" " -f1) - "${CMD_AUR_INSTALL[@]}" asusctl-git + "${CMD_AUR_INSTALL[@]}" asusctl "${qdbus_cmd}" "${kdialog_dbus}" /ProgressDialog org.kde.kdialog.ProgressDialog.close else echo "ASUS computer not detected." diff --git a/scripts/winesapos-upgrade.sh b/scripts/winesapos-upgrade.sh index a29b61c..d785696 100755 --- a/scripts/winesapos-upgrade.sh +++ b/scripts/winesapos-upgrade.sh @@ -1072,6 +1072,17 @@ fi sudo -E -u "${WINESAPOS_USER_NAME}" "${qdbus_cmd}" "${kdialog_dbus}" /ProgressDialog org.kde.kdialog.ProgressDialog.close echo "Running 4.2.0 to 4.3.0 upgrades complete." +echo "Running 4.3.0 to 4.4.0 upgrades..." +kdialog_dbus=$(sudo -E -u "${WINESAPOS_USER_NAME}" kdialog --title "winesapOS Upgrade" --progressbar "Running 4.2.0 to 4.3.0 upgrades..." 1 | cut -d" " -f1) + +if ${CMD_PACMAN} -Q asusctl-git; then + "${CMD_PACMAN_REMOVE[@]}" asusctl-git + "${CMD_AUR_INSTALL[@]}" asusctl +fi + +sudo -E -u "${WINESAPOS_USER_NAME}" "${qdbus_cmd}" "${kdialog_dbus}" /ProgressDialog org.kde.kdialog.ProgressDialog.close +echo "Running 4.3.0 to 4.4.0 upgrades complete." + echo "Upgrading system packages..." kdialog_dbus=$(sudo -E -u "${WINESAPOS_USER_NAME}" kdialog --title "winesapOS Upgrade" --progressbar "Please wait for all system packages to upgrade (this can take a long time)..." 11 | cut -d" " -f1) sudo -E -u "${WINESAPOS_USER_NAME}" "${qdbus_cmd}" "${kdialog_dbus}" /ProgressDialog showCancelButton false