From ebff05aea4147d6ec4f0be1e5f934e473f0453f4 Mon Sep 17 00:00:00 2001
From: toto <>
Date: Wed, 16 Nov 2022 11:18:11 +0100
Subject: [PATCH] Ask for hooks

---
 config/hooks/live/sublime_text.hook.chroot    |   9 +++
 .../etc/apt/sources.list.d/sublime-text.list  |   1 -
 .../apt/trusted.gpg.d/sublimehq-archive.gpg   | Bin 2758 -> 0 bytes
 config/package-lists/cli.list.chroot          |   1 +
 config/package-lists/gui.list.chroot          |   2 -
 make.sh                                       |  53 +++++++++++++-----
 6 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 config/hooks/live/sublime_text.hook.chroot
 delete mode 100644 config/includes.chroot/etc/apt/sources.list.d/sublime-text.list
 delete mode 100644 config/includes.chroot/etc/apt/trusted.gpg.d/sublimehq-archive.gpg

diff --git a/config/hooks/live/sublime_text.hook.chroot b/config/hooks/live/sublime_text.hook.chroot
new file mode 100644
index 0000000..87d86a2
--- /dev/null
+++ b/config/hooks/live/sublime_text.hook.chroot
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+wget -qO - https://download.sublimetext.com/sublimehq-pub.gpg | gpg --dearmor > /etc/apt/trusted.gpg.d/sublimehq-archive.gpg
+
+echo "deb http://download.sublimetext.com/ apt/stable/" > /etc/apt/sources.list.d/sublime-text.list
+
+apt-get update
+apt-get install sublime-text sublime-merge -y
+apt-get clean
diff --git a/config/includes.chroot/etc/apt/sources.list.d/sublime-text.list b/config/includes.chroot/etc/apt/sources.list.d/sublime-text.list
deleted file mode 100644
index fc956af..0000000
--- a/config/includes.chroot/etc/apt/sources.list.d/sublime-text.list
+++ /dev/null
@@ -1 +0,0 @@
-deb https://download.sublimetext.com/ apt/stable/
diff --git a/config/includes.chroot/etc/apt/trusted.gpg.d/sublimehq-archive.gpg b/config/includes.chroot/etc/apt/trusted.gpg.d/sublimehq-archive.gpg
deleted file mode 100644
index b14b989c00b593543c0c1301ffec983f0cc2bec5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2758
zcmV;%3OV(e0u2ON5Ve^B5CF<-=lbc<r<gJ4SM|gv22^m_C-r}uu<ILI(W*`!F0HO@
z5{%9e5b)XHg%neCK2q|Jzg9r&9D@}yi->swVkcmkOXxDZta^P4?LQzpSi<ADowW_o
zBNGw7{ZZVNJIiS6biUa9g{|)*jvwC`_Q8VNxbCqC*3&``O5RYUkllJ)R74B&tu?i_
zq)LaC5DHE*{W_%s9O3K+)e1eL1{$jQL_k$rp>Bd)8vY7{^|QKM#=Rx}B2)KAOc@8S
z7Mzv0t^$1t%K~S0RO)*r^H@1F;Q+7l_%^y-I(|o4A8~%iYgyKWXs$SQq3%TuLWerz
zb0pl&4*4)XfvKk#57{k%@0(*X$u%!k*^=0cJ;qsI!s?a~ytl{z=13#aaydm)^lWpk
zIpB5#Ro`uOrS06fnAvQaGN1XF63$(^x+BU@K8u)zWVb;fhTw4wwj`o$#pA$C*MDap
z1$|tQvih1<fIux-Ud~6pbD<?ai*d9`5$%ZBonR0M)4R88w4w-t)))H<4I_x|VMptZ
zLPFw{A1TDYs0UcpE3<Pn{7>W(&k45XYPBiD%Io?$L3dwLlt8S0%s>$rS>lw#OKHDz
z7goCp`C}nuvs+b(*A&@pb(`qW<L&zo&siSMab_pdQ#$)I#Ma&o!f4e_9mz9j23h_f
z3eg5;oQ=V40IdKK0RRECEK_x2Y-w#}AV^UlP;_}9Omt)*Jact$aBp&SKy!6sY-w#}
zbY*ySE@N+PK8XS}1QP)Q03HPbSrE0E0vj&_3ke4V6$%Lm1r`DW0RRFX0Rk6*0162Z
zt*&a)ijR;Q^YRb>TNyin0p!0m9=x{@xAsaR8P%ypd+#|g)1#Y3@4$<yVB74YV-A=w
zmGY~JU#fP+A-qOx1GSz9&dNHfZO+tu&J)%M-gk!TXa>Mbj_|}!@DO2^0m9(0vj22R
z-vq3JzL9)K)p^25h?VpV06h2UWHUCF{kAHMaSn_#&&a-bhO%UTXlUU;ptD?P$XUw>
zg9v{mlbCkco13d)CBQHu#*8s^GWy3hBTj1;=~L5%+v3E&Df{^#U163G`ix~t%VzmP
zz+eXz*C6taFIpzk{yxb7T`OY4js#50IRCJ2PK63Q4uVf4!A6NeOR*4|f5mJ+Xm=@B
zK0I}2SH1y00R<TTqMq8_jFBVLfhQwfTL4YH-)4=N2D2vGb~ZS)Ze2nf3V3v96pBQS
z{^B(cJR(mT9<c=6XHmmimxp9|K_+M7i_mZQ2Goe9TEDTdXT<NtIH4i4O#3+6)DL2S
zgk)<-ND;9xsm{yj@P|>&iPM}g8B@A0E1Ct~G!?h^Zw{YADM!ZD3J>H|ij9&f4=hvG
z!>U<m#BIad%*o7E#cEm~v##Nj=^rSCCvJqt1y0(~9p8ir?JWh}gBWopKQ3hh-ry}-
zILlvuAc;#S72I5w&OShbczI_YuBQ+5g0^=d?vT>zMuB^UT6sSv<M9WL6M&eFlBTjX
zP2AG_xdIIYSrE0E0T2MbP(6H+THDoK1%SZ=44^%t9|`GF!b-VOqw@Cx$kDW}<aUCb
zaQYT;4F_b-3qxqw#mIjYFei!fovr)E#*1MCyh7i%5S=C#Y15-9OY+y7cEo{_s%r^Y
zu>t*$j@cKsz8A!FcrR(~_In%W4c-bz8Qsj}Y55*KD-62t9NR9Q@=uCy=Ne2yRyP_O
z{)48cOq(PyN>#53SCCb1^&Rk+7O=d^$3Rj~6vxs(UJ94NE-6`NX>|kJ`vL{Iw62F#
z)2@C*bq>Mn0E7ua+^z6(lwFNK?rqbXzxveUV=23ZXo6U-Lrj9b59|_+6u=|MkVV0*
zm4B@wb^KC>?<~JN*ac*fTA4%!d?m#qZ*>Ir6RLFbL!E(D_Z5yL^q3|xSwz*FG9l4?
zh00$==4bnKTt2(4yv7UUES&3nZiy8mXu{C0hI<L|ZoD*DstE=$2FErPt3xsI*I`in
z$#Cvuy~>v777|oHgsWhpGF5Gz5k%TjmXwwE<uue;iB?yF+0TfDJdqo`S}@dDq2%2I
zEa0n=isxkEl!rg*-UaVLo36n=6=Y$`K?5Q|khIwWX{fQ#!Z3g`UAw7AzO<nQ5J^7m
z5-Dkx@z`I*=?oc?AkH^v!jOwHJ_AA6e{9{3Ecq*#Krcy9$I;+LCg9Jj);FO_(vbzO
zZPSVS-DdRw5di=Ji3C0b7y$wR2?YXK5Ve^C8v+6;2@tKWYSN02kQ%{VAOsl!0ssaD
z0$C8XnE(n25cPdeS-m~<RP&1v0D<^jp>K{u=7+?gQQ%-2!`K^7NQ+Vc#4WyeFjgV>
z*e0z{ST>)t2f^9Pw$Cw0CxB>2R?d<dF|`#tx{{G&^?``nt4Ju!LKvo8-EkpHzHr}?
z^q2|hNvi(FC1P<U4t<0!)zt-xQ2}4zA^cxcCf3pNxhK5IFkY>d))O0x6ZvEX$3IJ}
zQWZ;HI5IFj<?}en7ODLi@o`NxK=72MLvcS^rusv~PHD*Lfq<WoL{E@z%S8YA*+HPq
z<A-+mkN7upNpWLHtAO;rAq~Kh+Y0c=dEgGa9}p5SPFhfLV#nCQ-*I`wQRs+`GIHJT
zJT?bk_~Q1`P~_n9m0|Xxb7MLs22xT%PaMhU!l8+gx6zwfYT=<9owT6p`;|o^f=);P
zGl0+(fR%_vE}{E~)S-gf_3Sl!D@H9c>tP;W6<h%0Wr&P7)n1eR+=Wt%;cUYo|6%Ng
zjRyAH89}{Kt1kc5-LkiW6e9wuS44|TNPZi<RA`oVwYAx4xFcO1937_U-Oz!r8@SAv
zq}w$Kqae*0EfyCmG>)MhebC1|yS{3?Eo^wpT}>xhYMq|9J^Tu8<V5)DR+8JlS{qW+
z$W--X#^fnuS-g&76YIY%@ooFh5V5SE_^{%4Ji}w2UdxY0I31fPrIU7Nh9CGz@;3m-
zO{G?)YK*Q(5HmjgSZ&}B`T|3Ag75x8$*Nfg2B8+_lILV5!|wEI6J%N?4Scm3lXTNT
zvZ=_EbBL!^TU{lTO8e-+Fx5OAjdf2S%Y+$(?IZXcZLyPia~6CWD}gBzb~p{`2n>Oi
z$EA)Xj57~(^6rZAcKJ36H*!K)@u;loCC%*eQ|y_OKDXy}C|{z?7_<&-9>BT;3viRV
zX_?GC+Jf&2AMIGyXDdd(05pl-(u(JAiw#In>|@u89=zCIG<+g)RMV9$ADz#<@!dcG
zy(5}pvaa`9!1Ly~aE_wHKgwm=oC=M{_0)P%uOy_03&^*M*p+NI0Io)ruL=a)Ev^6k
z0KF@0n(~ZCwFLPcF6=LVm9;jQ2BvJnWOG&Xb}<{f0QuyTDvC}3UH~cq8QF2=e_}%O
zsFAx(vG4T+ukPJNgI=IfZObf&(Q1FJMgez28RjHEaW=g45R1q~BB2z2gkSd%01xt0
z4*VZR9w=!~rF#xIdVH7mOJ2Z&D`amlS&muooS+dix+7=gkG3&NB3?wKcEEDfT~67Y
zhD;6Hh167AdM*#c(uJx?uOADZvpE1f<!n3COGL|h15Mxw`E4fS)7MBv>vWb%rTG-X
zw<V$Xn=95x2FoM@$Y067vr?Yd5R{Vl!Wv-;lcc=s%J_Lfp^j8B%fq;0h+a)~)t%?8
MUITc79Q{s+2?l#01ONa4

diff --git a/config/package-lists/cli.list.chroot b/config/package-lists/cli.list.chroot
index aad9952..ad31a3f 100644
--- a/config/package-lists/cli.list.chroot
+++ b/config/package-lists/cli.list.chroot
@@ -19,6 +19,7 @@ pigz
 bzip2
 lbzip2
 xz-utils
+zstd
 p7zip-full
 p7zip-rar
 hwinfo
diff --git a/config/package-lists/gui.list.chroot b/config/package-lists/gui.list.chroot
index 82094f5..608262d 100644
--- a/config/package-lists/gui.list.chroot
+++ b/config/package-lists/gui.list.chroot
@@ -35,5 +35,3 @@ ssh-askpass-gnome
 tesseract-ocr
 tesseract-ocr-fra
 flatpak
-sublime-text
-sublime-merge
diff --git a/make.sh b/make.sh
index c940621..fbc45f5 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@ pack_name[vm]="Driver Virtualisation"
 
 pack_forced=(live cli disk net firmware)
 
-pack_default=(dm-common xfce4 gui vm)
+pack_default=(dm-common xfce4 gui)
 
 _usage()
 {
@@ -82,28 +82,49 @@ _check()
 
 _choose()
 {
-	declare -a checklist
+	declare -a pack_checklist
 	size=$((${#pack_list[@]}-(${#pack_forced[@]})))
 	for pack in ${pack_list[@]}; do
 		[[  "${pack_forced[*]}" =~ "$pack" ]] && continue
 		[[  "${pack_default[*]}" =~ "$pack" ]] && status="ON" || status="OFF"
 
-		checklist+=($pack "${pack_name[$pack]}" $status)
+		pack_checklist+=($pack "${pack_name[$pack]}" $status)
 	done
 
-	RESULT=$(whiptail --title "Make debian live system" --checklist "Select pack list" 15 70 ${size} "${checklist[@]}" 3>&1 1>&2 2>&3 | xargs)
+	RESULT=$(whiptail --title "Make debian live system" --checklist "Select pack list" 15 70 ${size} "${pack_checklist[@]}" 3>&1 1>&2 2>&3)
+	[[ "$?" = 1 ]] && printf "\e[91mCancel\e[0m\n" && exit
 
-	pack=("${pack_forced[@]} ${RESULT[@]}")
+	pack=("${pack_forced[@]} $(echo $RESULT | xargs)")
 
 	printf "Pack list: \e[96m${pack[*]}\e[0m\n"
 
-	read -p "Continue ? " -n 1 -r
-	echo
-	if ! [[ $REPLY =~ ^[YyOo]$ ]]
-	then
-		echo "Cancel"
-		exit
-	fi
+
+	nb_hooks=0
+	declare -a hook_checklist
+	for file in $config/hooks/live/*;
+	do
+		basename="$(basename -s ".hook.chroot" $file)"
+		hook_checklist+=($basename "" "ON")
+		((nb_hooks++))
+	done
+
+	#whiptail --separate-output --title "Make debian live system" --checklist "Select hooks to use" 15 70 ${nb_hooks} "${hook_checklist[@]}"
+
+	RESULT=$(whiptail --title "Make debian live system" --checklist "Select hooks to use" 15 70 ${nb_hooks} "${hook_checklist[@]}" 3>&1 1>&2 2>&3)
+	[[ "$?" = 1 ]] && printf "\e[91mCancel\e[0m\n" && exit
+
+	hooks=$(echo $RESULT | xargs)
+
+	printf "Hooks list: \e[96m${hooks[*]}\e[0m\n"
+
+#	read -p "Continue ? " -n 1 -r
+#	echo
+#	if ! [[ $REPLY =~ ^[YyOo]$ ]]
+#	then
+#		echo "Cancel"
+#		exit
+#	fi
+
 }
 
 _config()
@@ -116,9 +137,6 @@ _config()
 	ln -sr $config/includes.chroot $build/config
 	ln -sr $config/packages.chroot $build/config
 
-	mkdir -p $build/config/hooks
-	ln -sr $config/hooks/live $build/config/hooks
-
 	lb clean
 	lb clean --cache
 
@@ -143,6 +161,10 @@ _config()
 		ln -sr $config/package-lists/$file.list.chroot $build/config/package-lists/$file.list.chroot
 	done
 
+	for hook in ${hooks[@]}; do
+		ln -sr $config/hooks/live/$hook.hook.chroot $build/config/hooks/live/$hook.hook.chroot
+	done
+
 }
 
 _build()
@@ -158,6 +180,7 @@ _build()
 
 	# Write commit hash and build date
 	echo "$(git -C $baseDir log -1 --pretty='%cd %h %s' --date=format:"%F")" >> $build/chroot/etc/debian_version
+	echo "Build date: $(date +"%F %R")" >> $build/chroot/etc/debian_version
 
 }