diff --git a/install.sh b/install.sh index e68ed30ac..f462838e7 100755 --- a/install.sh +++ b/install.sh @@ -101,6 +101,18 @@ case $SKIP_HYPR_AUR in ;; esac +# https://github.com/end-4/dots-hyprland/issues/428#issuecomment-2081690658 +case $SKIP_PYMYC_AUR in + true) sleep 0;; + *) + if $ask;then + v $AUR_HELPER -S --answerclean=a python-materialyoucolor-git + else + v $AUR_HELPER -S --answerclean=a --noconfirm python-materialyoucolor-git + fi + ;; +esac + ## Optional dependencies if pacman -Qs ^plasma-browser-integration$ ;then SKIP_PLASMAINTG=true;fi diff --git a/scriptdata/dependencies.conf b/scriptdata/dependencies.conf index 79abf4f39..5d57813f2 100644 --- a/scriptdata/dependencies.conf +++ b/scriptdata/dependencies.conf @@ -1,6 +1,10 @@ ### This file supports bash-style comments, and blank lines. ### PKGs on same line will be send to `yay` together, unless `-f` is specified. +### Ones which need cleanbuild (see install.sh): +# hyprland-git +# python-materialyoucolor-git + ### Basic coreutils cliphist cmake curl fuzzel rsync wget ripgrep gojq npm meson typescript gjs dart-sass axel @@ -9,7 +13,7 @@ tinyxml2 gtkmm3 gtksourceviewmm cairomm ### Python # Add `python-setuptools-scm` and `python-wheel` explicitly to fix #197 -python-build python-materialyoucolor-git python-pillow python-pywal python-setuptools-scm python-wheel +python-build python-pillow python-pywal python-setuptools-scm python-wheel ### Basic graphic env xorg-xrandr diff --git a/scriptdata/options b/scriptdata/options index a93612bb6..fbd87ae06 100644 --- a/scriptdata/options +++ b/scriptdata/options @@ -17,6 +17,7 @@ If no option is specified, run default install process. --skip-ags Skip installing ags and its config --skip-hyprland Skip installing the config for Hyprland --skip-hypr-aur Skip installing hyprland-git + --skip-pymyc-aur Skip installing python-materialyoucolor-git --skip-fish Skip installing the config for Fish --skip-plasmaintg Skip installing plasma-browser-integration --skip-miscconf Skip copying the dirs and files to \".configs\" except for AGS, Fish and Hyprland @@ -32,7 +33,7 @@ cleancache(){ # `man getopt` to see more para=$(getopt \ -o hfk:cs \ - -l help,force,fontset:,deplistfile:,clean,skip-sysupdate,skip-ags,skip-fish,skip-hyprland,skip-hypr-aur,skip-plasmaintg,skip-miscconf \ + -l help,force,fontset:,deplistfile:,clean,skip-sysupdate,skip-ags,skip-fish,skip-hyprland,skip-hypr-aur,skip-pymyc-aur,skip-plasmaintg,skip-miscconf \ -n "$0" -- "$@") [ $? != 0 ] && echo "$0: Error when getopt, please recheck parameters." && exit 1 ##################################################################################### @@ -62,6 +63,7 @@ while true ; do --skip-ags) SKIP_AGS=true;shift;; --skip-hyprland) SKIP_HYPRLAND=true;shift;; --skip-hypr-aur) SKIP_HYPR_AUR=true;shift;; + --skip-pymyc-aur) SKIP_PYMYC_AUR=true;shift;; --skip-fish) SKIP_FISH=true;shift;; --skip-miscconf) SKIP_MISCCONF=true;shift;; --skip-plasmaintg) SKIP_PLASMAINTG=true;shift;;