From 2d2defecae26617c4adb39c7f05616e9f016d1d3 Mon Sep 17 00:00:00 2001
From: Hipstercat <tasty@hipstercat.fr>
Date: Fri, 16 Apr 2021 11:57:56 +0200
Subject: [PATCH] fixed timezone, firefox in french, optional grub and isolinux
 folders

---
 prepare.sh | 18 +++++++++++-------
 tasks.sh   |  4 +++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/prepare.sh b/prepare.sh
index 8b5fe4e..68eccea 100755
--- a/prepare.sh
+++ b/prepare.sh
@@ -2,7 +2,7 @@
 set -eE
 
 function clean() {
-    echo "==== CLEAN ERR ===="
+    echo "==== CLEAN ===="
     sudo umount "$WORKDIR/squashfs" || :
     sudo umount /tmp/livecd || :
 }
@@ -59,12 +59,16 @@ echo "==== Install extensions ===="
 sudo cp "$SPATH/firefox/extensions/"* "$WORKDIR/custom/usr/lib/firefox/distribution/extensions/"
 
 echo "==== Mod ISOLINUX (BIOS) AND GRUB (EFI) ===="
-# isolinux
-chmod -R +w "$WORKDIR/cd/isolinux"
-cp isolinux/* "$WORKDIR/cd/isolinux/"
-# grub
-chmod -R +w "$WORKDIR/cd/boot/grub"
-cp grub/* "$WORKDIR/cd/boot/grub/"
+if [[ -d isolinux ]]; then
+    # isolinux
+    chmod -R +w "$WORKDIR/cd/isolinux"
+    cp isolinux/* "$WORKDIR/cd/isolinux/"
+fi
+if [[ -d grub ]]; then
+    # grub
+    chmod -R +w "$WORKDIR/cd/boot/grub"
+    cp grub/* "$WORKDIR/cd/boot/grub/"
+fi
 
 # setup iso
 echo "==== Setup ISO ===="
diff --git a/tasks.sh b/tasks.sh
index 746c997..67ce59b 100644
--- a/tasks.sh
+++ b/tasks.sh
@@ -7,11 +7,13 @@ mount -t devpts none /dev/pts/
 
 # set timezone
 echo "Europe/Paris" > /etc/timezone
-ln -sf /usr/share/zoneinfo/$(cat /etc/timezone /etc/localtime
+ln -sf /usr/share/zoneinfo/$(cat /etc/timezone) /etc/localtime
 dpkg-reconfigure -f noninteractive tzdata
 
 sudo apt-get update
 
+sudo apt-get upgrade -y
+
 # install lang pack
 lang=fr
 for l in $(cat /usr/share/linuxmint/mintlocale/language_packs); do