From ecca375059ceba6b2cfb18e41bc39a07f3fd4173 Mon Sep 17 00:00:00 2001
From: Marcus <marcus@deltalima.org>
Date: Tue, 2 May 2023 23:02:13 +0200
Subject: [PATCH] added packages, some cosmetics, replaced zenity

---
 makeanything.sh                         |  5 ++--
 rootdir/etc/jwm/system.jwmrc            | 21 ++++++--------
 templates/install_base.custompkg.tpl.sh |  3 +-
 templates/install_base.tpl.sh           | 37 +++++++++++++------------
 4 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/makeanything.sh b/makeanything.sh
index 70c2bf7..7b8bd00 100755
--- a/makeanything.sh
+++ b/makeanything.sh
@@ -6,7 +6,7 @@
 ### 2023
 
 CHROOTCMD="sudo chroot build/chroot/"
-VERSION="$(git describe --tags)" #-$(git rev-parse --short HEAD)"
+test -n "$VERSION" || VERSION="$(git describe --tags)" #-$(git rev-parse --short HEAD)"
 
 MIRROR=$1
 if [ -z "$MIRROR" ]
@@ -50,8 +50,6 @@ error ()
 }
 
 message "installing requirements"
-# ~fakeroot fakechroot~
-# debootstrap chroot 
 ### https://www.willhaley.com/blog/custom-debian-live-environment/
 sudo apt install \
   debootstrap \
@@ -131,6 +129,7 @@ test -f build/staging/live/filesystem.squashfs && sudo rm build/staging/live/fil
 sudo mksquashfs \
     build/chroot \
     build/staging/live/filesystem.squashfs \
+    -comp xz \
     -e boot || error
 
 message "copy kernel and initrd images"
diff --git a/rootdir/etc/jwm/system.jwmrc b/rootdir/etc/jwm/system.jwmrc
index 63788f9..6c17d20 100644
--- a/rootdir/etc/jwm/system.jwmrc
+++ b/rootdir/etc/jwm/system.jwmrc
@@ -5,10 +5,10 @@
     <RootMenu onroot="12">
 	    <!--        <Include>/etc/jwm/debian-menu</Include> -->
 	<Include>exec: xdgmenumaker -n -i -f jwm</Include>
-        <Program icon="terminal.png" label="Terminal">xterm</Program>
+	<Program icon="/usr/share/icons/Adwaita/scalable/devices/video-display-symbolic.svg" label="Display settings">arandr</TrayButton>
         <Separator/>
         <Program icon="lock.png" label="Lock">
-            xlock -mode blank
+            xscreensaver-command -lock
         </Program>
 	<Separator/>
         <Restart label="Restart JWM" icon="restart.png"/>
@@ -17,10 +17,10 @@
 	<Separator/>
 	<Separator/>
 	<Program label="Reboot" icon="/usr/share/icons/Adwaita/scalable/emblems/emblem-synchronizing-symbolic.svg">
-	   zenity --question --text="Reboot?" --no-markup --default-cancel && systemctl reboot
+	   gxmessage "Reboot?" -title "Reboot?" -center -buttons Yes:0,No:1 -default No -font "bold 14"  && systemctl reboot
 	</Program>
 	<Program label="Shutdown" icon="/usr/share/icons/Adwaita/scalable/emblems/emblem-system-symbolic.svg">
-	   zenity --question --text="Shutdown?" --no-markup --default-cancel && systemctl poweroff
+	   gxmessage "Shutdown?"-title "Shutdown?" -center -buttons Yes:0,No:1 -default No -font "bold 14" && systemctl reboot
 	</Program>
 
     </RootMenu>
@@ -57,14 +57,8 @@
 	<Spacer width="2"/>
 	<TrayButton popup="Firefox" icon="/usr/share/icons/hicolor/32x32/apps/firefox-esr.png">exec:firefox</TrayButton>
 	<Spacer width="2"/>
-	<TrayButton popup="Transmission" icon="/usr/share/icons/hicolor/scalable/apps/transmission.svg">exec:transmission-gtk</TrayButton>
-	<Spacer width="2"/>
-	<TrayButton popup="X File Explorer" icon="/usr/share/pixmaps/xfe.xpm">exec:xfe</TrayButton>
-	<Spacer width="2"/>
 	<TrayButton popup="PCManFM" icon="/usr/share/icons/Adwaita/32x32/legacy/system-file-manager.png">exec:pcmanfm</TrayButton>
 	<Spacer width="2"/>
-	<TrayButton popup="ARandR" icon="/usr/share/icons/Adwaita/scalable/devices/video-display-symbolic.svg">exec:arandr</TrayButton>
-	<Spacer width="2"/>
 
 
         <Pager labeled="true"/>
@@ -124,8 +118,8 @@
     </PagerStyle>
     <MenuStyle>
         <Font>Sans-9</Font>
-        <Foreground>#FFFFFF</Foreground>
-        <Background>#333333</Background>
+        <Foreground>#111111</Foreground>
+        <Background>#777888</Background>
         <Outline>#000000</Outline>
         <Active>
             <Foreground>#FFFFFF</Foreground>
@@ -244,6 +238,7 @@
     <Key mask="A" key="Up">udesktop</Key>
     <Key mask="A" key="Down">ddesktop</Key>
     <StartupCommand>$(find ~/.screenlayout/ -type f -executable|head -n 1)</StartupCommand>
-    <StartupCommand>zenity --text-info --html --width=640 --height=480 --filename=/usr/share/nanodesk/firstlogin/welcome.html</StartupCommand>
+    <StartupCommand>xscreensaver -no-splash</StartupCommand>
+    <StartupCommand>gxmessage -center -file /usr/share/nanodesk/firstlogin/welcome.md -title "Welcome to nanodesk"</StartupCommand>
 
 </JWM>
diff --git a/templates/install_base.custompkg.tpl.sh b/templates/install_base.custompkg.tpl.sh
index 11c759d..2f0bc26 100644
--- a/templates/install_base.custompkg.tpl.sh
+++ b/templates/install_base.custompkg.tpl.sh
@@ -1,2 +1,3 @@
 apt install -y \
-audacious 
+	transmission \
+	audacious 
diff --git a/templates/install_base.tpl.sh b/templates/install_base.tpl.sh
index 0c1936d..59c321e 100644
--- a/templates/install_base.tpl.sh
+++ b/templates/install_base.tpl.sh
@@ -50,26 +50,28 @@ apt update || error
 
 ### packages
 message "install nanodesk base packages"
-apt install -y \
+apt install -y  \
 	live-boot \
+	dialog \
+	sudo \
+	console-data \
+	locales \
+	man \
 	grub-pc \
 	ifupdown \
 	net-tools \
+	isc-dhcp-client \
+	host \
 	wireless-tools \
 	wpagui \
-	isc-dhcp-client \
-	man \
-	console-data \
-	locales \
-	sudo \
 	xserver-xorg \
-	jwm \
-	xdm \
+	xscreensaver \
+	xfonts-75dpi \
+	xfonts-100dpi \
 	xterm \
+	xdm \
+	jwm \
 	xfe \
-	pcmanfm \
-	htop \
-	host \
 	mc \
 	wget \
 	curl \
@@ -77,14 +79,15 @@ apt install -y \
 	rsync \
 	vim \
 	links2 \
-	firefox-esr \
-	transmission-gtk \
-	lxterminal \
-	arandr \
-	zenity \
 	ncdu \
-	gparted \
+	htop \
 	git \
+	gxmessage \
+	arandr \
+	lxterminal \
+	gparted \
+	firefox-esr \
+	pcmanfm \
 	/tmp/xdgmenumaker*.deb || error
 
 ######