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 @@
exec: xdgmenumaker -n -i -f jwm
- xterm
+ arandr
- xlock -mode blank
+ xscreensaver-command -lock
@@ -17,10 +17,10 @@
- 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
- 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
@@ -57,14 +57,8 @@
exec:firefox
- exec:transmission-gtk
-
- exec:xfe
-
exec:pcmanfm
- exec:arandr
-
@@ -124,8 +118,8 @@
Sans-9
- #FFFFFF
- #333333
+ #111111
+ #777888
#000000
#FFFFFF
@@ -244,6 +238,7 @@
udesktop
ddesktop
$(find ~/.screenlayout/ -type f -executable|head -n 1)
- zenity --text-info --html --width=640 --height=480 --filename=/usr/share/nanodesk/firstlogin/welcome.html
+ xscreensaver -no-splash
+ gxmessage -center -file /usr/share/nanodesk/firstlogin/welcome.md -title "Welcome to nanodesk"
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
######