From 1ce8cfdf490678ad9f7a4f701b7f35b3fe9c094d Mon Sep 17 00:00:00 2001
From: clsty <celestial.y@outlook.com>
Date: Sat, 6 Apr 2024 07:35:06 +0800
Subject: [PATCH] Cleanbuild for hyprland-git, add option to skip

---
 install.sh                   | 14 ++++++++++++++
 scriptdata/dependencies.conf |  3 ++-
 scriptdata/options           |  4 +++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 927085fb1..d7557f484 100755
--- a/install.sh
+++ b/install.sh
@@ -88,6 +88,20 @@ else
   v $AUR_HELPER -S --needed --noconfirm ${pkglist[*]}
 fi
 
+
+# https://github.com/end-4/dots-hyprland/issues/389#issuecomment-2040671585
+case $SKIP_HYPR_AUR in
+  true) sleep 0;;
+  *)
+    if $ask;then
+      v $AUR_HELPER -S --answerclean=a hyprland-git
+    else
+      v $AUR_HELPER -S --answerclean=a --noconfirm hyprland-git
+    fi
+    ;;
+esac
+
+
 ## Optional dependencies
 if pacman -Qs ^plasma-browser-integration$ ;then SKIP_PLASMAINTG=true;fi
 case $SKIP_PLASMAINTG in
diff --git a/scriptdata/dependencies.conf b/scriptdata/dependencies.conf
index ca3e396f0..28d8149f7 100644
--- a/scriptdata/dependencies.conf
+++ b/scriptdata/dependencies.conf
@@ -1,4 +1,5 @@
 ### This file support bash-style comments, and blank lines.
+#
 ### PKGs on same line will be send to `yay` together, unless `-f` is specified.
 
 ### Basic
@@ -12,7 +13,7 @@ tinyxml2 gtkmm3 gtksourceviewmm cairomm
 python-build python-materialyoucolor-git python-pillow python-pywal python-setuptools-scm python-wheel
 
 ### Basic graphic env
-hyprland-git xorg-xrandr
+xorg-xrandr
 xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-hyprland-git
 
 ### Player and Audio
diff --git a/scriptdata/options b/scriptdata/options
index 208833b66..a93612bb6 100644
--- a/scriptdata/options
+++ b/scriptdata/options
@@ -16,6 +16,7 @@ If no option is specified, run default install process.
   -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-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
@@ -31,7 +32,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-plasmaintg,skip-miscconf \
+       -l help,force,fontset:,deplistfile:,clean,skip-sysupdate,skip-ags,skip-fish,skip-hyprland,skip-hypr-aur,skip-plasmaintg,skip-miscconf \
        -n "$0" -- "$@")
 [ $? != 0 ] && echo "$0: Error when getopt, please recheck parameters." && exit 1
 #####################################################################################
@@ -60,6 +61,7 @@ while true ; do
     -s|--skip-sysupdate) SKIP_SYSUPDATE=true;shift;;
     --skip-ags) SKIP_AGS=true;shift;;
     --skip-hyprland) SKIP_HYPRLAND=true;shift;;
+    --skip-hypr-aur) SKIP_HYPR_AUR=true;shift;;
     --skip-fish) SKIP_FISH=true;shift;;
     --skip-miscconf) SKIP_MISCCONF=true;shift;;
     --skip-plasmaintg) SKIP_PLASMAINTG=true;shift;;