diff --git a/conf/makeanything.conf b/conf/makeanything.conf deleted file mode 100644 index 2c9ea8b..0000000 --- a/conf/makeanything.conf +++ /dev/null @@ -1,5 +0,0 @@ -#DEBOOTSTRAP_SUITE="bullseye" -#DEBOOTSTRAP_OPTS="--extra-suites=bullseye-backports,bullseye-updates --components=main,contrib,non-free" -#DEBOOTSTRAP_OPTS="--extra-suites=${DEBOOTSTRAP_SUITE}-updates --components=main,contrib,non-free,non-free-firmware" -DEBOOTSTRAP_SUITE="bookworm" -DEBOOTSTRAP_OPTS="--components=main,contrib,non-free,non-free-firmware" diff --git a/install_base/install_base.sh b/install_base/install_base.sh index b6105ec..b2ac8ec 100644 --- a/install_base/install_base.sh +++ b/install_base/install_base.sh @@ -152,13 +152,6 @@ message "run custom steps from /tmp/install_base.customsteps.tpl.sh" #### ###### - -message "generate icon path list for jwm config" -find /usr/share/icons/ -type d > /tmp/jwm.iconlist -sed -i -e 's/^//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 e48fba1..ccbd9c5 100755 --- a/makeanything.sh +++ b/makeanything.sh @@ -6,7 +6,7 @@ ### 2023 ### include config -. conf/makeanything.conf +. makeanything.conf CHROOTCMD="sudo chroot build/chroot/" test -n "$VERSION" || VERSION="$(git describe --tags)" #-$(git rev-parse --short HEAD)" @@ -114,8 +114,13 @@ done message "copy build/nanodesk-files/ to build/chroot/" sudo cp -r build/nanodesk-files/* build/chroot/ +message "generate icon path list for jwm config" +find build/chroot/usr/share/icons/ -type d > build/tmp/jwm.iconlist +sed -i -e 's/^/\ \ \ \ /g' -e 's/$/<\/IconPath>/g' build/tmp/jwm.iconlist +sudo cp build/tmp/jwm.iconlist build/chroot/tmp/ || error + message "putting generated icon path list to /etc/jwm/system.jwmrc" -$CHROOTCMD sed -i '/<\!-- GENERATED ICONLIST -->/r /tmp/jwm.iconlist' /etc/jwm/system.jwmrc +$CHROOTCMD sed -i '/<\!-- GENERATED ICONLIST -->/r /tmp/jwm.iconlist' /etc/jwm/system.jwmrc || error message "correct file permissions" $CHROOTCMD /usr/bin/chmod 440 /etc/sudoers || error diff --git a/nanodesk-files/etc/jwm/system.jwmrc b/nanodesk-files/etc/jwm/system.jwmrc index c9092d3..70551d0 100644 --- a/nanodesk-files/etc/jwm/system.jwmrc +++ b/nanodesk-files/etc/jwm/system.jwmrc @@ -6,18 +6,18 @@ exec: xdgmenumaker -n -i -f jwm - arandr + arandr - - + + xscreensaver-command -lock - + - + gxmessage "Reboot?" -title "Reboot?" -center -buttons Yes:0,No:1 -default No -font "bold 14" && systemctl reboot - + gxmessage "Shutdown?" -title "Shutdown?" -center -buttons Yes:0,No:1 -default No -font "bold 14" && systemctl poweroff @@ -51,11 +51,11 @@ - exec:lxterminal + exec:lxterminal - exec:firefox + exec:firefox - exec:pcmanfm + exec:pcmanfm @@ -135,56 +135,10 @@ IconPath can be listed multiple times to allow searching for icons in multiple paths. --> - /usr/share/icons/gnome/256x256/actions - /usr/share/icons/gnome/256x256/apps - /usr/share/icons/gnome/256x256/categories - /usr/share/icons/gnome/256x256/devices - /usr/share/icons/gnome/256x256/emblems - /usr/share/icons/gnome/256x256/mimetypes - /usr/share/icons/gnome/256x256/places - /usr/share/icons/gnome/256x256/status - /usr/share/icons/gnome/32x32/actions - /usr/share/icons/gnome/32x32/animations - /usr/share/icons/gnome/32x32/apps - /usr/share/icons/gnome/32x32/categories - /usr/share/icons/gnome/32x32/devices - /usr/share/icons/gnome/32x32/emblems - /usr/share/icons/gnome/32x32/mimetypes - /usr/share/icons/gnome/32x32/places - /usr/share/icons/gnome/32x32/status - /usr/share/icons/gnome/scalable/actions - /usr/share/icons/gnome/scalable/apps - /usr/share/icons/gnome/scalable/categories - /usr/share/icons/gnome/scalable/devices - /usr/share/icons/gnome/scalable/emblems - /usr/share/icons/gnome/scalable/mimetypes - /usr/share/icons/gnome/scalable/places - /usr/share/icons/gnome/scalable/status - /usr/share/icons/hicolor/256x256/apps - /usr/share/icons/hicolor/256x256/mimetypes - /usr/share/icons/hicolor/32x32/actions - /usr/share/icons/hicolor/32x32/apps - /usr/share/icons/hicolor/32x32/categories - /usr/share/icons/hicolor/32x32/devices - /usr/share/icons/hicolor/32x32/emblems - /usr/share/icons/hicolor/32x32/mimetypes - /usr/share/icons/hicolor/32x32/status - /usr/share/icons/hicolor/512x512/apps - /usr/share/icons/hicolor/512x512/mimetypes - /usr/share/icons/hicolor/scalable/actions - /usr/share/icons/hicolor/scalable/apps - /usr/share/icons/hicolor/scalable/categories - /usr/share/icons/hicolor/scalable/devices - /usr/share/icons/hicolor/scalable/emblems - /usr/share/icons/hicolor/scalable/mimetypes - /usr/share/icons/hicolor/scalable/places - /usr/share/icons/hicolor/scalable/status - /usr/share/icons - /usr/share/pixmaps /usr/local/share/jwm - +