DeltaLima/nanodesk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed dynamic IconPath generation, adjusted jwm config to it

Browse source
This commit is contained in:
Marcus 2023-05-03 19:19:25 +02:00
parent d2f902b0c4
commit 8b5a63ba29
4 changed files with 17 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
conf/makeanything.conf
View file

@ -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"

7
install_base/install_base.sh
View file

@ -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/^/<IconPath>/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

9
makeanything.sh
View file

@ -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/^/\ \ \ \ <IconPath>/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

66
nanodesk-files/etc/jwm/system.jwmrc
View file

@ -6,18 +6,18 @@
<!-- <Include>/etc/jwm/debian-menu</Include> -->
<Include>exec: xdgmenumaker -n -i -f jwm</Include>
<Separator/>
<Program icon="/usr/share/icons/Adwaita/scalable/devices/video-display-symbolic.svg" label="Display settings">arandr</TrayButton>
<Program icon="video-display-symbolic" label="Display settings">arandr</TrayButton>
<Separator/>
<Restart label="Restart JWM" icon="/usr/share/icons/Adwaita/scalable/emblems/emblem-synchronizing-symbolic.svg"/>
<Program icon="/usr/share/icons/Adwaita/scalable/status/changes-prevent-symbolic.svg" label="Lock screen">
<Restart label="Restart JWM" icon="emblem-synchronizing-symbolic"/>
<Program icon="changes-prevent-symbolic" label="Lock screen">
xscreensaver-command -lock
</Program>
<Exit label="Logout" confirm="true" icon="/usr/share/icons/Adwaita/scalable/actions/system-log-out-symbolic.svg"/>
<Exit label="Logout" confirm="true" icon="system-log-out-symbolic"/>
<Separator/>
<Program label="Reboot" icon="/usr/share/icons/Adwaita/scalable/actions/system-reboot-symbolic.svg">
<Program label="Reboot" icon="system-reboot-symbolic">
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/actions/system-shutdown-symbolic.svg">
<Program label="Shutdown" icon="system-shutdown-symbolic">
gxmessage "Shutdown?" -title "Shutdown?" -center -buttons Yes:0,No:1 -default No -font "bold 14" && systemctl poweroff
</Program>
@ -51,11 +51,11 @@
<Spacer width="2"/>
<!-- custom TrayButton -->
<TrayButton popup="LXTerminal" icon="/usr/share/icons/hicolor/128x128/apps/lxterminal.png">exec:lxterminal </TrayButton>
<TrayButton popup="LXTerminal" icon="lxterminal">exec:lxterminal </TrayButton>
<Spacer width="2"/>
<TrayButton popup="Firefox" icon="/usr/share/icons/hicolor/32x32/apps/firefox-esr.png">exec:firefox</TrayButton>
<TrayButton popup="Firefox" icon="firefox-esr">exec:firefox</TrayButton>
<Spacer width="2"/>
<TrayButton popup="PCManFM" icon="/usr/share/icons/Adwaita/scalable/legacy/system-file-manager-symbolic.svg">exec:pcmanfm</TrayButton>
<TrayButton popup="PCManFM" icon="system-file-manager">exec:pcmanfm</TrayButton>
<Spacer width="2"/>
@ -135,56 +135,10 @@
IconPath can be listed multiple times to allow searching
for icons in multiple paths.
-->
<IconPath>/usr/share/icons/gnome/256x256/actions</IconPath>
<IconPath>/usr/share/icons/gnome/256x256/apps</IconPath>
<IconPath>/usr/share/icons/gnome/256x256/categories</IconPath>
<IconPath>/usr/share/icons/gnome/256x256/devices</IconPath>
<IconPath>/usr/share/icons/gnome/256x256/emblems</IconPath>
<IconPath>/usr/share/icons/gnome/256x256/mimetypes</IconPath>
<IconPath>/usr/share/icons/gnome/256x256/places</IconPath>
<IconPath>/usr/share/icons/gnome/256x256/status</IconPath>
<IconPath>/usr/share/icons/gnome/32x32/actions</IconPath>
<IconPath>/usr/share/icons/gnome/32x32/animations</IconPath>
<IconPath>/usr/share/icons/gnome/32x32/apps</IconPath>
<IconPath>/usr/share/icons/gnome/32x32/categories</IconPath>
<IconPath>/usr/share/icons/gnome/32x32/devices</IconPath>
<IconPath>/usr/share/icons/gnome/32x32/emblems</IconPath>
<IconPath>/usr/share/icons/gnome/32x32/mimetypes</IconPath>
<IconPath>/usr/share/icons/gnome/32x32/places</IconPath>
<IconPath>/usr/share/icons/gnome/32x32/status</IconPath>
<IconPath>/usr/share/icons/gnome/scalable/actions</IconPath>
<IconPath>/usr/share/icons/gnome/scalable/apps</IconPath>
<IconPath>/usr/share/icons/gnome/scalable/categories</IconPath>
<IconPath>/usr/share/icons/gnome/scalable/devices</IconPath>
<IconPath>/usr/share/icons/gnome/scalable/emblems</IconPath>
<IconPath>/usr/share/icons/gnome/scalable/mimetypes</IconPath>
<IconPath>/usr/share/icons/gnome/scalable/places</IconPath>
<IconPath>/usr/share/icons/gnome/scalable/status</IconPath>
<IconPath>/usr/share/icons/hicolor/256x256/apps</IconPath>
<IconPath>/usr/share/icons/hicolor/256x256/mimetypes</IconPath>
<IconPath>/usr/share/icons/hicolor/32x32/actions</IconPath>
<IconPath>/usr/share/icons/hicolor/32x32/apps</IconPath>
<IconPath>/usr/share/icons/hicolor/32x32/categories</IconPath>
<IconPath>/usr/share/icons/hicolor/32x32/devices</IconPath>
<IconPath>/usr/share/icons/hicolor/32x32/emblems</IconPath>
<IconPath>/usr/share/icons/hicolor/32x32/mimetypes</IconPath>
<IconPath>/usr/share/icons/hicolor/32x32/status</IconPath>
<IconPath>/usr/share/icons/hicolor/512x512/apps</IconPath>
<IconPath>/usr/share/icons/hicolor/512x512/mimetypes</IconPath>
<IconPath>/usr/share/icons/hicolor/scalable/actions</IconPath>
<IconPath>/usr/share/icons/hicolor/scalable/apps</IconPath>
<IconPath>/usr/share/icons/hicolor/scalable/categories</IconPath>
<IconPath>/usr/share/icons/hicolor/scalable/devices</IconPath>
<IconPath>/usr/share/icons/hicolor/scalable/emblems</IconPath>
<IconPath>/usr/share/icons/hicolor/scalable/mimetypes</IconPath>
<IconPath>/usr/share/icons/hicolor/scalable/places</IconPath>
<IconPath>/usr/share/icons/hicolor/scalable/status</IconPath>
<IconPath>/usr/share/icons</IconPath>
<IconPath>/usr/share/pixmaps</IconPath>
<IconPath>
/usr/local/share/jwm
</IconPath>
<!-- the comment below is important for nanodesk to put in the actual IconPaths of the system generated by makeanything.sh -->
<!-- GENERATED ICONLIST -->