Fix and improve make script

config/hooks/live/normcap.hook.chroot

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-python3 -m pip install normcap
+python3 -m pip install --break-system-packages normcap
 

config/package-lists/cli.list.chroot

@@ -21,7 +21,7 @@ lbzip2
 xz-utils
 zstd
 p7zip-full
-p7zip-rar
+#p7zip-rar
 zip
 unzip
 hwinfo

config/package-lists/firmware.list.chroot

@@ -1,28 +1,15 @@
 firmware-amd-graphics
 firmware-atheros
-firmware-bnx2
-firmware-bnx2x
 firmware-brcm80211
-firmware-cavium
-firmware-intel-sound
-firmware-intelwimax
-firmware-ipw2x00
-firmware-ivtv
 firmware-iwlwifi
-firmware-libertas
+firmware-realtek
+firmware-intel-sound
+firmware-sof-signed
+firmware-iwlwifi
+firmware-realtek
 firmware-linux
 firmware-linux-free
 firmware-linux-nonfree
 firmware-misc-nonfree
-firmware-myricom
-firmware-netronome
-firmware-netxen
-firmware-qcom-media
-firmware-qlogic
-firmware-realtek
-firmware-samsung
-firmware-siano
-firmware-ti-connectivity
-firmware-zd1211
 amd64-microcode
 intel-microcode

config/package-lists/gui.list.chroot

@@ -23,14 +23,12 @@ gedit
 gnome-calculator
 vlc
 hardinfo
-network-manager/bullseye-backports
+network-manager
 network-manager-gnome
-libnm0/bullseye-backports
-remmina/bullseye-backports
-remmina-common/bullseye-backports
-remmina-plugin-vnc/bullseye-backports
-remmina-plugin-rdp/bullseye-backports
-remmina-plugin-spice/bullseye-backports
+remmina
+remmina-common
+remmina-plugin-vnc
+remmina-plugin-rdp
 virt-manager
 gir1.2-spiceclientgtk-3.0
 libvirt-clients

config/package-lists/net.list.chroot

@@ -18,4 +18,4 @@ openssh-client
 openssh-sftp-server
 libnss3-tools
 wpasupplicant
-torbrowser-launcher/bullseye-backports
+torbrowser-launcher

make.sh

@@ -28,7 +28,7 @@ pack_name[vm]="Driver Virtualisation"
 
 pack_forced=(live cli disk net firmware)
 
-pack_default=(dm-common xfce4 gui)
+pack_default=(dm-common gui xfce4 cinnamon libreoffice)
 
 
 nb_hooks=0
@@ -42,6 +42,8 @@ do
   hooks+="$basename "
 done
 
+#default DISABLE sid
+sid=-1
 
 _usage()
 {
@@ -147,7 +149,7 @@ _config()
   --architectures amd64 \
   --distribution $debian_version \
   --binary-images iso-hybrid \
-  --archive-areas "main contrib non-free" \
+  --archive-areas "main contrib non-free-firmware" \
   --debian-installer none \
   --apt-recommends false \
   --updates true \
@@ -174,78 +176,84 @@ _build()
   
   printf "\e[96mBootstrap new root filesystem\e[0m\n"
   lb bootstrap
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
 
   #printf "\e[96mBuild live OS file system\e[0m\n"
   #lb chroot
-  #[[ $? -eq 0 ]] || exit
+  #[[ $? -eq 0 ]] || _exit_error
 
   printf "\e[96mBuild live OS file system\e[0m\n"
   lb chroot_cache restore
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_prep install all mode-archives-chroot
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_devpts install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_proc install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_selinuxfs install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_sysfs install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_debianchroot install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_dpkg install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_tmpfs install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_sysv-rc install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_hosts install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_resolv install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_hostname install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_apt install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_archives chroot install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_linux-image 
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_firmware 
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_preseed 
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_includes_before_packages 
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
 
 
   [[ $sid -eq 0 ]] && _sid
 
 
   lb chroot_package-lists install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_install-packages install
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_package-lists live
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_install-packages live
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_includes_after_packages 
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_hooks 
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_hacks 
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
   lb chroot_interactive 
-  [[ $? -eq 0 ]] || exit
+  [[ $? -eq 0 ]] || _exit_error
+
+}
+
+_build_remove()
+{
+
   lb chroot_prep remove all mode-archives-chroot
   [[ $? -eq 0 ]] || exit
-  lb chroot_archives chroot remove
-  [[ $? -eq 0 ]] || exit
-  lb chroot_apt remove
-  [[ $? -eq 0 ]] || exit
+#  lb chroot_archives chroot remove
+#  [[ $? -eq 0 ]] || exit
+#  lb chroot_apt remove
+#  [[ $? -eq 0 ]] || exit
   lb chroot_hostname remove
   [[ $? -eq 0 ]] || exit
   lb chroot_resolv remove
@@ -380,6 +388,14 @@ _create_iso()
 
 }
 
+_exit_error()
+{
+  printf "\e[91mError\e[0m\n"
+  _build_remove
+  _delete
+  exit
+}
+
 _delete()
 {
   printf "\e[96mDelete $build\e[0m\n"
@@ -411,10 +427,11 @@ _check
 [[ $default = true ]] && pack=("${pack_forced[@]} ${pack_default[@]}") || _choose
 _config
 _build
+_build_remove
 
 mkdir -p $build/chroot/etc/skel/.ssh
 cp -v $USER_HOME/.ssh/{config,key_rsa_majalis,key_rsa_majalis.pub} $build/chroot/etc/skel/.ssh
-ssh-keygen -f $USER_HOME/.ssh/known_hosts -q -H -F netdldata.net > $build/chroot/etc/skel/.ssh/known_hosts
+ssh-keygen -f $USER_HOME/.ssh/known_hosts -q -H -F ssh.netdldata.net > $build/chroot/etc/skel/.ssh/known_hosts
  
  _prep_mounts
 _create_squashfs