Skip to content

Commit 711fb48

Browse files
committed
Improve handle deprecated deps logic (#2425)
1 parent 6d4ea70 commit 711fb48

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

sdata/dist-arch/install-deps.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ install-yay(){
1414

1515
# NOTE: `handle-deprecated-dependencies` was for the old days when we just switch from dependencies.conf to local PKGBUILDs.
1616
# However, let's just keep it as references for other distros writing their `sdata/dist-<DISTRO_ID>/install-deps.sh`, if they need it.
17-
handle-deprecated-dependencies(){
17+
remove_deprecated_dependencies(){
1818
printf "${STY_CYAN}[$0]: Removing deprecated dependencies:${STY_RST}\n"
1919
for i in illogical-impulse-{microtex,pymyc-aur} hyprland-qtutils {quickshell,hyprutils,hyprpicker,hyprlang,hypridle,hyprland-qt-support,hyprland-qtutils,hyprlock,xdg-desktop-portal-hyprland,hyprcursor,hyprwayland-scanner,hyprland}-git;do try sudo pacman --noconfirm -Rdd $i;done
20+
}
21+
implicitize_old_dependencies(){
2022
# Convert old dependencies to non explicit dependencies so that they can be orphaned if not in meta packages
2123
remove_bashcomments_emptylines ./sdata/dist-arch/previous_dependencies.conf ./cache/old_deps_stripped.conf
2224
readarray -t old_deps_list < ./cache/old_deps_stripped.conf
@@ -37,6 +39,9 @@ if ! command -v pacman >/dev/null 2>&1; then
3739
exit 1
3840
fi
3941

42+
showfun remove_deprecated_dependencies
43+
v remove_deprecated_dependencies
44+
4045
# Issue #363
4146
case $SKIP_SYSUPDATE in
4247
true) sleep 0;;
@@ -51,8 +56,8 @@ if ! command -v yay >/dev/null 2>&1;then
5156
v install-yay
5257
fi
5358

54-
showfun handle-deprecated-dependencies
55-
v handle-deprecated-dependencies
59+
showfun implicitize_old_dependencies
60+
v implicitize_old_dependencies
5661

5762
# https://github.com/end-4/dots-hyprland/issues/581
5863
# yay -Bi is kinda hit or miss, instead cd into the relevant directory and manually source and install deps

0 commit comments

Comments
 (0)