From ec2c44651a31b97a11320e23efd80ca4cbdaba2e Mon Sep 17 00:00:00 2001 From: Marcus Date: Wed, 3 May 2023 15:46:57 +0200 Subject: [PATCH] use pandoc to generate html from md files, use dillo to view welcome screen, renamed rootdir to nanodesk-files --- makeanything.sh | 24 ++++-- .../etc/X11/xdm/Xresources | 0 .../etc/jwm/system.jwmrc | 3 +- {rootdir => nanodesk-files}/etc/sudoers | 0 .../etc/xdg/gsimplecal/config | 0 .../root/nanodesk-installer.sh | 2 +- .../share/doc/nanodesk/welcome}/welcome.md | 0 .../share/nanodesk/images/linux_button.svg | 0 .../pixmaps/nanodesk-bw-installed.xpm | 0 .../nanodesk/pixmaps/nanodesk-bw-live.xpm | 0 .../share/nanodesk/pixmaps/nanodesk-bw.xpm | 0 .../nanodesk/pixmaps/nanodesk-installed.xpm | 0 .../share/nanodesk/pixmaps/nanodesk-live.xpm | 0 .../usr/share/nanodesk/pixmaps/nanodesk.xpm | 0 nanodesk-files/usr/share/nanodesk/version | 1 + pandoc/pandoc.css | 78 +++++++++++++++++++ templates/install_base.tpl.sh | 1 + 17 files changed, 100 insertions(+), 9 deletions(-) rename {rootdir => nanodesk-files}/etc/X11/xdm/Xresources (100%) rename {rootdir => nanodesk-files}/etc/jwm/system.jwmrc (98%) rename {rootdir => nanodesk-files}/etc/sudoers (100%) rename {rootdir => nanodesk-files}/etc/xdg/gsimplecal/config (100%) rename {rootdir => nanodesk-files}/root/nanodesk-installer.sh (98%) rename {rootdir/usr/share/nanodesk/firstlogin => nanodesk-files/usr/share/doc/nanodesk/welcome}/welcome.md (100%) rename {rootdir => nanodesk-files}/usr/share/nanodesk/images/linux_button.svg (100%) rename {rootdir => nanodesk-files}/usr/share/nanodesk/pixmaps/nanodesk-bw-installed.xpm (100%) rename {rootdir => nanodesk-files}/usr/share/nanodesk/pixmaps/nanodesk-bw-live.xpm (100%) rename {rootdir => nanodesk-files}/usr/share/nanodesk/pixmaps/nanodesk-bw.xpm (100%) rename {rootdir => nanodesk-files}/usr/share/nanodesk/pixmaps/nanodesk-installed.xpm (100%) rename {rootdir => nanodesk-files}/usr/share/nanodesk/pixmaps/nanodesk-live.xpm (100%) rename {rootdir => nanodesk-files}/usr/share/nanodesk/pixmaps/nanodesk.xpm (100%) create mode 100644 nanodesk-files/usr/share/nanodesk/version create mode 100644 pandoc/pandoc.css diff --git a/makeanything.sh b/makeanything.sh index 03a036f..32ebc0b 100755 --- a/makeanything.sh +++ b/makeanything.sh @@ -63,7 +63,7 @@ sudo apt install \ mtools \ dosfstools \ coreutils \ - markdown || error + pandoc || error message "start building nanodesk ${YELLOW}${VERSION}${ENDCOLOR}" @@ -72,7 +72,7 @@ read -p "press [enter] to continue" ### stuff begins here message "creating build directories" -for dir in $(echo build/{staging/{EFI/BOOT,boot/grub/x86_64-efi,isolinux,live},tmp,chroot}) +for dir in $(echo build/{staging/{EFI/BOOT,boot/grub/x86_64-efi,isolinux,live}tmp,chroot,nanodesk-files}) do message "$dir" test -d $dir || mkdir -p $dir @@ -97,12 +97,22 @@ $CHROOTCMD /bin/bash /tmp/install_base.sh || error message "clear /tmp" $CHROOTCMD /usr/bin/rm -Rf /tmp/* || error -message "write nanodesk version $VERSION into rootdir/usr/share/nanodesk/version" -echo $VERSION > rootdir/usr/share/nanodesk/version -### copy nanodesk configs to chroot -message "copy nanodesk config files into chroot" -sudo cp -r rootdir/* build/chroot/ +### copy nanodesk files in nanodesk-files/ to build/nanodesk-files/ so we can make changes there, +### like generate version file and convert .md to .html in usr/share/docs/nanodesk +message "copy nanodesk-files/ to build/nanodesk-files/" +sudo cp -r nanodesk-files/* build/nanodesk-files/ + +message "write nanodesk version $VERSION into build/nanodesk-files/usr/share/nanodesk/version" +echo $VERSION > nanodesk-files/usr/share/nanodesk/version + +message "convert .md files in build/nanodesk-files/usr/doc/nanodesk/ to .html" +for md in $(find build/nanodesk-files/usr/share/doc/nanodesk/ -name "*.md") + do pandoc --self-contained --css=pandoc/pandoc.css -M pagetitle:$(basename $md|sed 's/\.md//') -s $md -o $(echo $md | sed 's/\.md/\.html/') +done + +message "copy build/nanodesk-files/ to build/chroot/" +sudo cp -r build/nanodesk-files/* build/chroot/ message "correct file permissions" $CHROOTCMD /usr/bin/chmod 440 /etc/sudoers || error diff --git a/rootdir/etc/X11/xdm/Xresources b/nanodesk-files/etc/X11/xdm/Xresources similarity index 100% rename from rootdir/etc/X11/xdm/Xresources rename to nanodesk-files/etc/X11/xdm/Xresources diff --git a/rootdir/etc/jwm/system.jwmrc b/nanodesk-files/etc/jwm/system.jwmrc similarity index 98% rename from rootdir/etc/jwm/system.jwmrc rename to nanodesk-files/etc/jwm/system.jwmrc index e8658e1..8a95154 100644 --- a/rootdir/etc/jwm/system.jwmrc +++ b/nanodesk-files/etc/jwm/system.jwmrc @@ -236,10 +236,11 @@ ldesktop udesktop ddesktop + $(find ~/.screenlayout/ -type f -executable|head -n 1) xscreensaver -no-splash - gxmessage -center -file /usr/share/nanodesk/firstlogin/welcome.md -title "Welcome to nanodesk" volumeicon connman-ui-gtk + dillo -f -g 640x480 /usr/share/doc/nanodesk/welcome/welcome.html diff --git a/rootdir/etc/sudoers b/nanodesk-files/etc/sudoers similarity index 100% rename from rootdir/etc/sudoers rename to nanodesk-files/etc/sudoers diff --git a/rootdir/etc/xdg/gsimplecal/config b/nanodesk-files/etc/xdg/gsimplecal/config similarity index 100% rename from rootdir/etc/xdg/gsimplecal/config rename to nanodesk-files/etc/xdg/gsimplecal/config diff --git a/rootdir/root/nanodesk-installer.sh b/nanodesk-files/root/nanodesk-installer.sh similarity index 98% rename from rootdir/root/nanodesk-installer.sh rename to nanodesk-files/root/nanodesk-installer.sh index 6821a38..a8843ca 100755 --- a/rootdir/root/nanodesk-installer.sh +++ b/nanodesk-files/root/nanodesk-installer.sh @@ -50,7 +50,7 @@ error () { finish () { message "removing firststart dialoge from jwm config" - $CHROOTCMD /usr/bin/sed -i '/firstlogin\/welcome/d' /etc/jwm/system.jwmrc || error + $CHROOTCMD /usr/bin/sed -i '/doc\/nanodesk\/welcome\/welcome\.html/d' /etc/jwm/system.jwmrc || error message "removing installer files from target" $CHROOTCMD /usr/bin/rm -Rf /root/nanodesk-installer.sh || error diff --git a/rootdir/usr/share/nanodesk/firstlogin/welcome.md b/nanodesk-files/usr/share/doc/nanodesk/welcome/welcome.md similarity index 100% rename from rootdir/usr/share/nanodesk/firstlogin/welcome.md rename to nanodesk-files/usr/share/doc/nanodesk/welcome/welcome.md diff --git a/rootdir/usr/share/nanodesk/images/linux_button.svg b/nanodesk-files/usr/share/nanodesk/images/linux_button.svg similarity index 100% rename from rootdir/usr/share/nanodesk/images/linux_button.svg rename to nanodesk-files/usr/share/nanodesk/images/linux_button.svg diff --git a/rootdir/usr/share/nanodesk/pixmaps/nanodesk-bw-installed.xpm b/nanodesk-files/usr/share/nanodesk/pixmaps/nanodesk-bw-installed.xpm similarity index 100% rename from rootdir/usr/share/nanodesk/pixmaps/nanodesk-bw-installed.xpm rename to nanodesk-files/usr/share/nanodesk/pixmaps/nanodesk-bw-installed.xpm diff --git a/rootdir/usr/share/nanodesk/pixmaps/nanodesk-bw-live.xpm b/nanodesk-files/usr/share/nanodesk/pixmaps/nanodesk-bw-live.xpm similarity index 100% rename from rootdir/usr/share/nanodesk/pixmaps/nanodesk-bw-live.xpm rename to nanodesk-files/usr/share/nanodesk/pixmaps/nanodesk-bw-live.xpm diff --git a/rootdir/usr/share/nanodesk/pixmaps/nanodesk-bw.xpm b/nanodesk-files/usr/share/nanodesk/pixmaps/nanodesk-bw.xpm similarity index 100% rename from rootdir/usr/share/nanodesk/pixmaps/nanodesk-bw.xpm rename to nanodesk-files/usr/share/nanodesk/pixmaps/nanodesk-bw.xpm diff --git a/rootdir/usr/share/nanodesk/pixmaps/nanodesk-installed.xpm b/nanodesk-files/usr/share/nanodesk/pixmaps/nanodesk-installed.xpm similarity index 100% rename from rootdir/usr/share/nanodesk/pixmaps/nanodesk-installed.xpm rename to nanodesk-files/usr/share/nanodesk/pixmaps/nanodesk-installed.xpm diff --git a/rootdir/usr/share/nanodesk/pixmaps/nanodesk-live.xpm b/nanodesk-files/usr/share/nanodesk/pixmaps/nanodesk-live.xpm similarity index 100% rename from rootdir/usr/share/nanodesk/pixmaps/nanodesk-live.xpm rename to nanodesk-files/usr/share/nanodesk/pixmaps/nanodesk-live.xpm diff --git a/rootdir/usr/share/nanodesk/pixmaps/nanodesk.xpm b/nanodesk-files/usr/share/nanodesk/pixmaps/nanodesk.xpm similarity index 100% rename from rootdir/usr/share/nanodesk/pixmaps/nanodesk.xpm rename to nanodesk-files/usr/share/nanodesk/pixmaps/nanodesk.xpm diff --git a/nanodesk-files/usr/share/nanodesk/version b/nanodesk-files/usr/share/nanodesk/version new file mode 100644 index 0000000..82942c3 --- /dev/null +++ b/nanodesk-files/usr/share/nanodesk/version @@ -0,0 +1 @@ +v0.1.6 diff --git a/pandoc/pandoc.css b/pandoc/pandoc.css new file mode 100644 index 0000000..102109d --- /dev/null +++ b/pandoc/pandoc.css @@ -0,0 +1,78 @@ +/* this file is based on https://pandoc.org/demo/pandoc.css */ + +body { + margin: auto; + padding-right: 1em; + padding-left: 1em; + color: black; + font-family: Verdana, sans-serif; + font-size: 100%; + line-height: 140%; + color: #333; +} +pre,code { + background-color: #ececec; +} +pre { + border: 1px dotted gray; + color: #1111111; + padding: 0.5em; +} +code { + font-family: monospace; +} +h1 a, h2 a, h3 a, h4 a, h5 a { + text-decoration: none; + /*color: #7a5ada; */ +} +h1, h2, h3, h4, h5 { + /* font-family: verdana; */ + font-family: Verdana, sans-serif; + font-weight: bold; + border-bottom: 1px dotted black; + /* color: #7a5ada; */ + } +h1 { + font-size: 150%; +} + +h2 { + font-size: 110%; +} + +h3 { + font-size: 95%; +} + +h4 { + font-size: 90%; + font-style: italic; +} + +h5 { + font-size: 90%; + font-style: italic; +} + +h1.title { + font-size: 200%; + font-weight: bold; + padding-top: 0.2em; + padding-bottom: 0.2em; + text-align: left; + border: none; +} + +dt code { + font-weight: bold; +} +dd p { + margin-top: 0; +} + +#footer { + padding-top: 1em; + font-size: 70%; + color: gray; + text-align: center; + } diff --git a/templates/install_base.tpl.sh b/templates/install_base.tpl.sh index a9abb31..c7ed810 100644 --- a/templates/install_base.tpl.sh +++ b/templates/install_base.tpl.sh @@ -92,6 +92,7 @@ apt install -y \ arandr \ lxterminal \ gparted \ + dillo \ firefox-esr \ pcmanfm \ /tmp/xdgmenumaker*.deb || error