From d2f902b0c4ad1e062cf6574aa909f01cf371d548 Mon Sep 17 00:00:00 2001
From: Marcus <marcus@deltalima.org>
Date: Wed, 3 May 2023 18:53:52 +0200
Subject: [PATCH] generate icon path list for jwm config, moved install_base.sh
 stuff to install_base/

---
 .../install_base.customsteps.sh               |  0
 .../install_base.sh                           | 51 +++++++++++--------
 makeanything.sh                               | 17 ++++---
 nanodesk-files/etc/jwm/system.jwmrc           |  3 ++
 4 files changed, 43 insertions(+), 28 deletions(-)
 rename templates/install_base.custompkg.tpl.sh => install_base/install_base.customsteps.sh (100%)
 rename templates/install_base.tpl.sh => install_base/install_base.sh (88%)

diff --git a/templates/install_base.custompkg.tpl.sh b/install_base/install_base.customsteps.sh
similarity index 100%
rename from templates/install_base.custompkg.tpl.sh
rename to install_base/install_base.customsteps.sh
diff --git a/templates/install_base.tpl.sh b/install_base/install_base.sh
similarity index 88%
rename from templates/install_base.tpl.sh
rename to install_base/install_base.sh
index ccc71fc..b6105ec 100644
--- a/templates/install_base.tpl.sh
+++ b/install_base/install_base.sh
@@ -35,6 +35,9 @@ error ()
 ### hostname setting
 echo nanodesk > /etc/hostname
 
+message "set hostname in hosts"
+sed -i 's/localhost/localhost nanodesk/g' /etc/hosts
+
 ### noninteractive
 DEBIAN_FRONTEND=noninteractive
 export DEBIAN_FRONTEND
@@ -48,7 +51,7 @@ export DEBIAN_FRONTEND
 message "apt update"
 apt update || error
 
-### packages
+### install base packages
 message "install nanodesk base packages"
 apt install -y  \
 	linux-image-amd64 \
@@ -98,30 +101,10 @@ apt install -y  \
 	pcmanfm \
 	/tmp/xdgmenumaker*.deb || error
 
-######
-####
-##
-## customization can be done here
-##  the placeholder within '%%' gets 
-####  filled by makeanything.sh
-######
-
-message "install custom packages from templates/install_base.custompkg.tpl.sh"
-. /tmp/install_base.custompkg.tpl.sh
-
-######
-#### it's a simple sudo 
-## command
-##  / customization End /
-##
-####
-######
 
 #message "install linux-kernel from backports"
 #apt install -t bullseye-backports -y linux-image-amd64
 
-message "set hostname in hosts"
-sed -i 's/localhost/localhost nanodesk/g' /etc/hosts
 
 ### set root password
 message "set root password to 'debian'"
@@ -150,6 +133,32 @@ echo "Europe/Berlin" > /etc/timezone && \
     locale-gen en_US.UTF-8 && \
     update-locale LANG=en_US.UTF-8
 
+######
+####
+##
+## customization can be done here
+##  the placeholder within '%%' gets 
+####  filled by makeanything.sh
+######
+
+message "run custom steps from /tmp/install_base.customsteps.tpl.sh"
+. /tmp/install_base.customsteps.sh
+
+######
+#### it's a simple sudo 
+## command
+##  / customization End /
+##
+####
+######
+
+
+message "generate icon path list for jwm config"
+find /usr/share/icons/ -type d > /tmp/jwm.iconlist
+sed -i -e 's/^/<IconPath>/g' -e 's/$/<\/IconPath>/g' /tmp/jwm.iconlist
+#message "putting generated icon path list to /etc/jwm/system.jwmrc"
+#sed -i '/<\!-- GENERATED ICONLIST -->/r /tmp/jwm.iconlist' /etc/jwm/system.jwmrc
+
 ### clean cache
 message "apt clean"
 apt clean
diff --git a/makeanything.sh b/makeanything.sh
index 030f960..e48fba1 100755
--- a/makeanything.sh
+++ b/makeanything.sh
@@ -89,17 +89,14 @@ sudo debootstrap ${DEBOOTSTRAP_OPTS} ${DEBOOTSTRAP_SUITE} build/chroot/ $MIRROR
 message "copy xdgmenumaker deb file into chroot"
 sudo cp deb/xdgmenumaker* build/chroot/tmp || error
 
-message "generate template/install_base.sh to build/chroot/tmp/install_base.sh"
-sudo cp templates/install_base.tpl.sh build/chroot/tmp/install_base.sh || error
-sudo cp templates/install_base.custompkg.tpl.sh build/chroot/tmp/ || error
+message "copy install_base scripts to build/chroot/tmp/"
+sudo cp install_base/* build/chroot/tmp/ || error
 
 
+#### install_base
 message "run install_base.sh"
 $CHROOTCMD /bin/bash /tmp/install_base.sh || error
-
-message "clear /tmp"
-$CHROOTCMD /usr/bin/rm -Rf /tmp/* || error
-
+####
 
 ### copy nanodesk files in nanodesk-files/ to build/nanodesk-files/ so we can make changes there,
 ### like generate version file and convert .md to .html in usr/share/docs/nanodesk
@@ -117,10 +114,16 @@ done
 message "copy build/nanodesk-files/ to build/chroot/"
 sudo cp -r build/nanodesk-files/* build/chroot/
 
+message "putting generated icon path list to /etc/jwm/system.jwmrc"
+$CHROOTCMD sed -i '/<\!-- GENERATED ICONLIST -->/r /tmp/jwm.iconlist' /etc/jwm/system.jwmrc
+
 message "correct file permissions"
 $CHROOTCMD /usr/bin/chmod 440 /etc/sudoers || error
 $CHROOTCMD /usr/bin/chmod 755 /root/nanodesk-installer.sh || error
 
+message "clear /tmp"
+$CHROOTCMD /usr/bin/rm -Rf /tmp/* || error
+
 ### liveboot part, https://www.willhaley.com/blog/custom-debian-live-environment/
 message "make squashfs"
 test -f build/staging/live/filesystem.squashfs && sudo rm build/staging/live/filesystem.squashfs
diff --git a/nanodesk-files/etc/jwm/system.jwmrc b/nanodesk-files/etc/jwm/system.jwmrc
index 037a008..c9092d3 100644
--- a/nanodesk-files/etc/jwm/system.jwmrc
+++ b/nanodesk-files/etc/jwm/system.jwmrc
@@ -185,6 +185,9 @@
         /usr/local/share/jwm
     </IconPath>
 
+    <!-- GENERATED ICONLIST -->
+
+
     <!-- Virtual Desktops -->
     <!-- Desktop tags can be contained within Desktops for desktop names. -->
     <Desktops width="4" height="1">