From 16479f771cf755825d24dfc9c75ff4501a83c833 Mon Sep 17 00:00:00 2001
From: Marcus <marcus@deltalima.org>
Date: Wed, 3 May 2023 17:34:20 +0200
Subject: [PATCH] fixed debootstrap, use now connman-gtk as tray

---
 makeanything.sh                     | 7 ++++---
 nanodesk-files/etc/jwm/system.jwmrc | 3 +--
 templates/install_base.tpl.sh       | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/makeanything.sh b/makeanything.sh
index b14510b..c67c503 100755
--- a/makeanything.sh
+++ b/makeanything.sh
@@ -33,7 +33,7 @@ function message() {
      ;;
      esac
 
-     if [ "$1" == "info" ] || [ "$1" == "error" ]
+     if [ "$1" == "info" ] || [ "$1" == "warn" ] || [ "$1" == "error" ]
      then
        MESSAGE=$2
      else
@@ -84,10 +84,11 @@ done
 #DEBOOTSTRAP_SUITE="bullseye"
 #DEBOOTSTRAP_OPTS="--extra-suites=bullseye-backports,bullseye-updates --components=main,contrib,non-free"
 DEBOOTSTRAP_SUITE="bookworm"
-DEBOOTSTRAP_OPTS="--extra-suites=${DEBOOTSTRAP_SUITE}-updates --components=main,contrib,non-free,non-free-firmware"
+#DEBOOTSTRAP_OPTS="--extra-suites=${DEBOOTSTRAP_SUITE}-updates --components=main,contrib,non-free,non-free-firmware"
+DEBOOTSTRAP_OPTS="--components=main,contrib,non-free,non-free-firmware"
 
 message "running debootstrap $DEBOOTSTRAP_OPTS $DEBOOTSTRAP_SUITE $MIRROR"
-sudo debootstrap ${DEBOOTSTRAP_OPTS} ${DEBOOTSTRAP_SUITE} build/chroot/ $MIRROR || sudo debootstrap ${DEBOOTSTRAP_SUITE} build/chroot/ $MIRROR
+sudo debootstrap ${DEBOOTSTRAP_OPTS} ${DEBOOTSTRAP_SUITE} build/chroot/ $MIRROR || message warn "debootstrap exited with code $?"
 
 message "copy xdgmenumaker deb file into chroot"
 sudo cp deb/xdgmenumaker* build/chroot/tmp || error
diff --git a/nanodesk-files/etc/jwm/system.jwmrc b/nanodesk-files/etc/jwm/system.jwmrc
index f2ab7e2..037a008 100644
--- a/nanodesk-files/etc/jwm/system.jwmrc
+++ b/nanodesk-files/etc/jwm/system.jwmrc
@@ -6,7 +6,6 @@
 	    <!--        <Include>/etc/jwm/debian-menu</Include> -->
 	<Include>exec: xdgmenumaker -n -i -f jwm</Include>
 	<Separator/>
-	<Program icon="/usr/share/icons/Adwaita/scalable/legacy/preferences-system-network-symbolic.svg" label="Network settings">connman-gtk</TrayButton>
 	<Program icon="/usr/share/icons/Adwaita/scalable/devices/video-display-symbolic.svg" label="Display settings">arandr</TrayButton>
 	<Separator/>
 	<Restart label="Restart JWM" icon="/usr/share/icons/Adwaita/scalable/emblems/emblem-synchronizing-symbolic.svg"/>
@@ -240,7 +239,7 @@
     <StartupCommand>$(find ~/.screenlayout/ -type f -executable|head -n 1)</StartupCommand>
     <StartupCommand>xscreensaver -no-splash</StartupCommand>
     <StartupCommand>volumeicon</StartupCommand>
-    <StartupCommand>connman-ui-gtk</StartupCommand>
+    <StartupCommand>connman-gtk</StartupCommand>
     <StartupCommand>dillo -f -g 640x480 /usr/share/doc/nanodesk/welcome/welcome.html</StartupCommand>
 
 </JWM>
diff --git a/templates/install_base.tpl.sh b/templates/install_base.tpl.sh
index e6a03c3..ccc71fc 100644
--- a/templates/install_base.tpl.sh
+++ b/templates/install_base.tpl.sh
@@ -66,7 +66,6 @@ apt install -y  \
 	wireless-tools \
 	wpagui \
 	connman-gtk \
-	connman-ui \
 	xserver-xorg \
 	xscreensaver \
 	xfonts-75dpi \