From 7a22d396168dbeb1fb6e5ad0c149c6986cdb0f14 Mon Sep 17 00:00:00 2001 From: Marcus Date: Sun, 22 Oct 2023 06:10:08 +0200 Subject: [PATCH] introducing nanodesk-first-start, renaming stuff --- install_base/install_base.customsteps.sh | 3 ++- install_base/install_base.sh | 5 ++++- makeanything.sh | 7 ++++--- nanodesk-files/etc/jwm/system.nanodesk.jwmrc | 3 ++- nanodesk-files/usr/bin/{jwm-nanodesk => nanodesk} | 0 nanodesk-files/usr/bin/nanodesk-first-start | 8 ++++++++ nanodesk-files/usr/share/xsessions/nanodesk.desktop | 6 +++--- 7 files changed, 23 insertions(+), 9 deletions(-) rename nanodesk-files/usr/bin/{jwm-nanodesk => nanodesk} (100%) create mode 100755 nanodesk-files/usr/bin/nanodesk-first-start diff --git a/install_base/install_base.customsteps.sh b/install_base/install_base.customsteps.sh index 2f0bc26..6d2da41 100644 --- a/install_base/install_base.customsteps.sh +++ b/install_base/install_base.customsteps.sh @@ -1,3 +1,4 @@ apt install -y \ transmission \ - audacious + audacious \ + vlc \ diff --git a/install_base/install_base.sh b/install_base/install_base.sh index 9c7d1d3..b1c15b7 100644 --- a/install_base/install_base.sh +++ b/install_base/install_base.sh @@ -85,6 +85,7 @@ apt install -y --no-install-recommends \ xscreensaver \ xfonts-75dpi \ xfonts-100dpi \ + fonts-noto-color-emoji \ x11-apps \ x11-utils \ xdg-utils \ @@ -103,6 +104,8 @@ apt install -y --no-install-recommends \ ncdu \ htop \ git \ + telnet \ + netcat \ gxmessage \ gsimplecal \ alsa-utils \ @@ -111,10 +114,10 @@ apt install -y --no-install-recommends \ xfe \ xarchiver \ lxterminal \ + lxpolkit \ gparted \ dillo \ falkon \ - fonts-noto-color-emoji \ gtk2-engines \ gnome-themes-extra \ squashfs-tools \ diff --git a/makeanything.sh b/makeanything.sh index bd777ae..74d7238 100755 --- a/makeanything.sh +++ b/makeanything.sh @@ -125,14 +125,15 @@ $CHROOTCMD sed -i '/<\!-- GENERATED ICONLIST -->/r /tmp/jwm.iconlist' /etc/jwm/s message "correct file permissions" #$CHROOTCMD /usr/bin/chmod 440 /etc/sudoers || error $CHROOTCMD /usr/bin/chmod 755 /root/nanodesk-installer.sh || error -$CHROOTCMD /usr/bin/chmod 755 /usr/bin/jwm-nanodesk || error +$CHROOTCMD /usr/bin/chmod 755 /usr/bin/nanodesk || error +$CHROOTCMD /usr/bin/chmod 755 /usr/bin/nanodesk-first-start || error message "set x-terminal-emulator to lxterminal" $CHROOTCMD /usr/bin/update-alternatives --set x-terminal-emulator /usr/bin/lxterminal message "set x-window-manager to jwm-nanodesk" -$CHROOTCMD /usr/bin/update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/jwm-nanodesk 25 -$CHROOTCMD /usr/bin/update-alternatives --set x-window-manager /usr/bin/jwm-nanodesk +$CHROOTCMD /usr/bin/update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/nanodesk 25 +$CHROOTCMD /usr/bin/update-alternatives --set x-window-manager /usr/bin/nanodesk ### set root password #message "set root password to 'debian'" diff --git a/nanodesk-files/etc/jwm/system.nanodesk.jwmrc b/nanodesk-files/etc/jwm/system.nanodesk.jwmrc index 7d87136..100cc8c 100644 --- a/nanodesk-files/etc/jwm/system.nanodesk.jwmrc +++ b/nanodesk-files/etc/jwm/system.nanodesk.jwmrc @@ -193,12 +193,13 @@ udesktop ddesktop + nanodesk-first-start $(find ~/.screenlayout/ -type f -executable|head -n 1) lxpolkit pcmanfm --desktop xscreensaver -no-splash volumeicon connman-gtk - dillo -f -g 640x480 /usr/share/doc/nanodesk/welcome/welcome.html + diff --git a/nanodesk-files/usr/bin/jwm-nanodesk b/nanodesk-files/usr/bin/nanodesk similarity index 100% rename from nanodesk-files/usr/bin/jwm-nanodesk rename to nanodesk-files/usr/bin/nanodesk diff --git a/nanodesk-files/usr/bin/nanodesk-first-start b/nanodesk-files/usr/bin/nanodesk-first-start new file mode 100755 index 0000000..8ceac37 --- /dev/null +++ b/nanodesk-files/usr/bin/nanodesk-first-start @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ ! -d ${HOME}/.config/nanodesk ] +then + mkdir -p ${HOME}/.config/nanodesk + xdg-user-dirs-update + dillo -f -g 640x480 /usr/share/doc/nanodesk/welcome/welcome.html & +fi diff --git a/nanodesk-files/usr/share/xsessions/nanodesk.desktop b/nanodesk-files/usr/share/xsessions/nanodesk.desktop index aba15b4..2f2532c 100644 --- a/nanodesk-files/usr/share/xsessions/nanodesk.desktop +++ b/nanodesk-files/usr/share/xsessions/nanodesk.desktop @@ -3,9 +3,9 @@ Name=nanodesk Comment=nanodesk configuration for jwm - Minimalistic pure X11 window manager with menu/tray support Type=Application Terminal=False -Exec=/usr/bin/jwm -f /etc/jwm/system.nanodesk.jwmrc -TryExec=jwm -Icon=/usr/share/jwm/jwm-red.svg +Exec=/usr/bin/nanodesk +TryExec=nanodesk +Icon=/usr/share/nanodesk/images/linux_button.svg Keywords=X11;floating;windowmanager; [Window Manager]