Don't output vars for normal runs, default SVG to false

linuxserver · Nov 25, 2024 · 043d6cf · 043d6cf
1 parent 14c3044
commit 043d6cf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ If you need to test functionality just run:
 
 ```bash
 docker pull lscr.io/linuxserver/d2-builder:latest && \
-docker run -d --rm -v /tmp/d2:/output -e PUID=1000 -e PGID=1000 lscr.io/linuxserver/d2-builder:latest mastodon:latest
+docker run -d --rm -v /tmp/d2:/output -e PUID=1000 -e PGID=1000 -e SVG=true lscr.io/linuxserver/d2-builder:latest mastodon:latest
 ```
 
 Generated svg files will be created in `/output`.

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -13,7 +13,7 @@ full_custom_readme: |
 
   ```bash
   docker pull lscr.io/linuxserver/d2-builder:latest && \
-  docker run -d --rm -v /tmp/d2:/output -e PUID=1000 -e PGID=1000 lscr.io/linuxserver/d2-builder:latest mastodon:latest
+  docker run -d --rm -v /tmp/d2:/output -e PUID=1000 -e PGID=1000 -e SVG=true lscr.io/linuxserver/d2-builder:latest mastodon:latest
   ```
 
   Generated svg files will be created in `/output`.

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
@@ -97,6 +97,7 @@ done
 
 shopt -s globstar
 
+if [[ -n ${SVG} ]]; then
 cat <<EOF > "/output/${OUTPUTNAME}"
 vars: {
   d2-config: {
@@ -107,6 +108,7 @@ vars: {
 }
 
 EOF
+fi
 
 echo "\"${IMAGENAME}:${TAGNAME}\": {" >> "/output/${OUTPUTNAME}"
 

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
@@ -15,7 +15,7 @@ else
     OUTPUTNAME="${IMAGENAME}-${TAGNAME}"
 fi
 
-if [[ -z ${RAW} ]]; then
+if [[ -n ${SVG} ]]; then
     s6-setuidgid abc d2 "/output/${OUTPUTNAME}.d2" "/output/${OUTPUTNAME}.svg"
     chmod 644 "/output/${OUTPUTNAME}.d2" "/output/${OUTPUTNAME}.svg"
 else