diff --git a/install.sh b/install.sh index ceb39a0d7..6be2cd439 100755 --- a/install.sh +++ b/install.sh @@ -102,23 +102,25 @@ case $SKIP_HYPR_AUR in esac # https://github.com/end-4/dots-hyprland/issues/428#issuecomment-2081690658 +# https://github.com/end-4/dots-hyprland/issues/428#issuecomment-2081701482 +# https://github.com/end-4/dots-hyprland/issues/428#issuecomment-2081707099 +pymyc=(python-materialyoucolor-git gradience-git python-libsass python-material-color-utilities) case $SKIP_PYMYC_AUR in true) sleep 0;; *) if $ask;then - v $AUR_HELPER -S --answerclean=a python-materialyoucolor-git + v $AUR_HELPER -S --answerclean=a ${pymyc[@]} else - v $AUR_HELPER -S --answerclean=a --noconfirm python-materialyoucolor-git + v $AUR_HELPER -S --answerclean=a --noconfirm ${pymyc[@]} fi ;; esac -# https://github.com/end-4/dots-hyprland/issues/428#issuecomment-2081701482 case $SKIP_GRADIENCE_AUR in true) sleep 0;; *) if $ask;then - v $AUR_HELPER -S --answerclean=a gradience-git + v $AUR_HELPER -S --answerclean=a else v $AUR_HELPER -S --answerclean=a --noconfirm gradience-git fi diff --git a/scriptdata/dependencies.conf b/scriptdata/dependencies.conf index 1071f3e2c..9fe10337d 100644 --- a/scriptdata/dependencies.conf +++ b/scriptdata/dependencies.conf @@ -3,11 +3,10 @@ ### Ones which need cleanbuild (see install.sh): # hyprland-git -# python-materialyoucolor-git -# gradience-git +# python-materialyoucolor-git gradience-git dart-sass python-material-color-utilities ### Basic -coreutils cliphist cmake curl fuzzel rsync wget ripgrep gojq npm meson typescript gjs dart-sass axel +coreutils cliphist cmake curl fuzzel rsync wget ripgrep gojq npm meson typescript gjs axel # Make deps of MicroTeX tinyxml2 gtkmm3 gtksourceviewmm cairomm diff --git a/scriptdata/options b/scriptdata/options index 36c6a3001..94b8a2628 100644 --- a/scriptdata/options +++ b/scriptdata/options @@ -17,12 +17,14 @@ 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-gradience-aur Skip installing gradience-git + --skip-pymyc-aur Skip installing python-materialyoucolor-git, gradience-git, + python-libsass and python-material-color-utilities --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 - --deplistfile Specify a dependency list file. By default \"./scriptdata/dependencies.conf\" + --skip-miscconf Skip copying the dirs and files to \".configs\" except for + AGS, Fish and Hyprland + --deplistfile Specify a dependency list file. By default + \"./scriptdata/dependencies.conf\" --fontset (Unavailable yet) Use a set of pre-defined font and config " } @@ -34,7 +36,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-pymyc-aur,skip-gradience-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 ##################################################################################### @@ -65,7 +67,6 @@ while true ; do --skip-hyprland) SKIP_HYPRLAND=true;shift;; --skip-hypr-aur) SKIP_HYPR_AUR=true;shift;; --skip-pymyc-aur) SKIP_PYMYC_AUR=true;shift;; - --skip-gradience-aur) SKIP_GRADIENCE_AUR=true;shift;; --skip-fish) SKIP_FISH=true;shift;; --skip-miscconf) SKIP_MISCCONF=true;shift;; --skip-plasmaintg) SKIP_PLASMAINTG=true;shift;;