From 0510862487370a37c1720ee1848e1258503eaaf6 Mon Sep 17 00:00:00 2001 From: clsty Date: Mon, 29 Apr 2024 07:49:35 +0800 Subject: [PATCH] Cleanbuild for gradience-git (#428) --- install.sh | 12 ++++++++++++ scriptdata/dependencies.conf | 3 ++- scriptdata/options | 30 ++++++++++++++++-------------- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/install.sh b/install.sh index f462838e7..ceb39a0d7 100755 --- a/install.sh +++ b/install.sh @@ -113,6 +113,18 @@ case $SKIP_PYMYC_AUR in ;; 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 + else + v $AUR_HELPER -S --answerclean=a --noconfirm gradience-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 5d57813f2..1071f3e2c 100644 --- a/scriptdata/dependencies.conf +++ b/scriptdata/dependencies.conf @@ -4,6 +4,7 @@ ### Ones which need cleanbuild (see install.sh): # hyprland-git # python-materialyoucolor-git +# gradience-git ### Basic coreutils cliphist cmake curl fuzzel rsync wget ripgrep gojq npm meson typescript gjs dart-sass axel @@ -32,7 +33,7 @@ polkit-gnome gnome-keyring gnome-control-center blueberry networkmanager brightn python-pywayland python-psutil hypridle-git hyprlock-git wlogout wl-clipboard hyprpicker-git anyrun-git ### Fonts and Themes -adw-gtk3-git qt5ct qt5-wayland gradience-git fontconfig ttf-readex-pro ttf-jetbrains-mono-nerd ttf-material-symbols-variable-git ttf-space-mono-nerd fish foot starship +adw-gtk3-git qt5ct qt5-wayland fontconfig ttf-readex-pro ttf-jetbrains-mono-nerd ttf-material-symbols-variable-git ttf-space-mono-nerd fish foot starship ### Screenshot and Recoder swappy wf-recorder grim tesseract tesseract-data-eng slurp diff --git a/scriptdata/options b/scriptdata/options index fbd87ae06..36c6a3001 100644 --- a/scriptdata/options +++ b/scriptdata/options @@ -10,19 +10,20 @@ echo -e "Syntax: $0 [Options]... Idempotent installation script for dotfiles. If no option is specified, run default install process. - -h, --help Print this help message and exit - -f, --force (Dangerous) Force mode without any confirm - -c, --clean Clean the build cache first - -s, --skip-sysupdate Skip \"sudo pacman -Syu\" - --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 - --deplistfile Specify a dependency list file. By default \"./scriptdata/dependencies.conf\" - --fontset (Unavailable yet) Use a set of pre-defined font and config + -h, --help Print this help message and exit + -f, --force (Dangerous) Force mode without any confirm + -c, --clean Clean the build cache first + -s, --skip-sysupdate Skip \"sudo pacman -Syu\" + --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-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\" + --fontset (Unavailable yet) Use a set of pre-defined font and config " } @@ -33,7 +34,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-plasmaintg,skip-miscconf \ + -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 \ -n "$0" -- "$@") [ $? != 0 ] && echo "$0: Error when getopt, please recheck parameters." && exit 1 ##################################################################################### @@ -64,6 +65,7 @@ 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;;