diff --git a/README.md b/README.md index 1a176a2..2bfcf89 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ docker pull lscr.io/linuxserver/d2-builder:latest && \ docker run -d --rm -v /tmp/d2:/output -v /opt/repos:/input:ro -e PUID=1000 -e PGID=1000 -e LOCAL=true lscr.io/linuxserver/d2-builder:latest mastodon:latest ``` -Generated svg files will be created in `/output`. +Generated d2 and svg files will be created in `/output`. If `RAW=true` then only d2 files will be created. ## Versions diff --git a/root/etc/s6-overlay/s6-rc.d/init-d2-config/run b/root/etc/s6-overlay/s6-rc.d/init-d2-config/run index cb9ffc3..8c6c956 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-d2-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-d2-config/run @@ -94,13 +94,13 @@ done shopt -s globstar cat < "/output/${OUTPUTNAME}" - vars: { - d2-config: { - layout-engine: elk - theme-id: 1 - dark-theme-id: 200 - } +vars: { + d2-config: { + layout-engine: elk + theme-id: 1 + dark-theme-id: 200 } +} EOF diff --git a/root/etc/s6-overlay/s6-rc.d/init-d2-output/run b/root/etc/s6-overlay/s6-rc.d/init-d2-output/run index f97ba58..a75e0a3 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-d2-output/run +++ b/root/etc/s6-overlay/s6-rc.d/init-d2-output/run @@ -9,6 +9,9 @@ else TAGNAME="latest" fi -s6-setuidgid abc d2 "/output/${IMAGENAME}-${TAGNAME}.d2" "/output/${IMAGENAME}-${TAGNAME}.svg" - -chmod 644 "/output/${IMAGENAME}-${TAGNAME}.d2" "/output/${IMAGENAME}-${TAGNAME}.svg" +if [[ -z ${RAW} ]]; then + s6-setuidgid abc d2 "/output/${IMAGENAME}-${TAGNAME}.d2" "/output/${IMAGENAME}-${TAGNAME}.svg" + chmod 644 "/output/${IMAGENAME}-${TAGNAME}.d2" "/output/${IMAGENAME}-${TAGNAME}.svg" +else + chmod 644 "/output/${IMAGENAME}-${TAGNAME}.d2" +fi