From 8fa41a15f184660ab5bda5f86d645ba9b2582389 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Thu, 16 Mar 2023 11:56:31 -0700 Subject: support indented heredocs, add new "Reader macros" manual section Signed-off-by: Sean Whitton --- src/property/apt.lisp | 12 ++++++------ src/property/sbuild.lisp | 18 +++++++++--------- src/property/schroot.lisp | 30 +++++++++++++++--------------- 3 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src/property') diff --git a/src/property/apt.lisp b/src/property/apt.lisp index f7a258e..11367d2 100644 --- a/src/property/apt.lisp +++ b/src/property/apt.lisp @@ -209,12 +209,12 @@ packages. Does not do any automatic upgrades." (:desc "apt periodic updates") (:hostattrs (os:required 'os:debianlike)) (:apply - (file:has-content "/etc/apt/apt.conf.d/02periodic" -#>EOF>APT::Periodic::Enable "1"; -APT::Periodic::Update-Package-Lists "1"; -APT::Periodic::Download-Upgradeable-Packages "1"; -APT::Periodic::Verbose "1"; -EOF)) + (file:has-content "/etc/apt/apt.conf.d/02periodic" #>>~EOF>> + APT::Periodic::Enable "1"; + APT::Periodic::Update-Package-Lists "1"; + APT::Periodic::Download-Upgradeable-Packages "1"; + APT::Periodic::Verbose "1"; + EOF)) (:unapply (file:does-not-exist "/etc/apt/apt.conf.d/02periodic"))) diff --git a/src/property/sbuild.lisp b/src/property/sbuild.lisp index 297e836..9a0eca6 100644 --- a/src/property/sbuild.lisp +++ b/src/property/sbuild.lisp @@ -123,17 +123,17 @@ To take advantage of the piuparts and autopkgtest support, add to your (file:contains-lines "/etc/schroot/sbuild/fstab" "/var/cache/ccache-sbuild /var/cache/ccache-sbuild none rw,bind 0 0")) ;; Script from . - (file:has-content "/var/cache/ccache-sbuild/sbuild-setup" -#>EOF>#!/bin/sh + (file:has-content "/var/cache/ccache-sbuild/sbuild-setup" #>>~EOF>> + #!/bin/sh -export CCACHE_DIR=/var/cache/ccache-sbuild -export CCACHE_UMASK=002 -export CCACHE_COMPRESS=1 -unset CCACHE_HARDLINK -export PATH="/usr/lib/ccache:$PATH" + export CCACHE_DIR=/var/cache/ccache-sbuild + export CCACHE_UMASK=002 + export CCACHE_COMPRESS=1 + unset CCACHE_HARDLINK + export PATH="/usr/lib/ccache:$PATH" -exec "$@" -EOF :mode #o755) + exec "$@" + EOF :mode #o755) ;; schroot (chroot:os-bootstrapped-for ,chroot-options ,chroot ,host) diff --git a/src/property/schroot.lisp b/src/property/schroot.lisp index e528f10..3601c45 100644 --- a/src/property/schroot.lisp +++ b/src/property/schroot.lisp @@ -44,22 +44,22 @@ Implicitly sets SCHROOT:USES-OVERLAYS. Shell script from ." (:desc "schroot overlays in tmpfs") (:hostattrs (push-hostattr 'uses-overlays t)) - (:apply (file:has-content "/etc/schroot/setup.d/04tmpfs" -#>EOF>#!/bin/sh + (:apply + (file:has-content "/etc/schroot/setup.d/04tmpfs" #>>~EOF>> + #!/bin/sh -set -e + set -e -. "$SETUP_DATA_DIR/common-data" -. "$SETUP_DATA_DIR/common-functions" -. "$SETUP_DATA_DIR/common-config" + . "$SETUP_DATA_DIR/common-data" + . "$SETUP_DATA_DIR/common-functions" + . "$SETUP_DATA_DIR/common-config" - -if [ $STAGE = "setup-start" ]; then - mount -t tmpfs overlay /var/lib/schroot/union/overlay -elif [ $STAGE = "setup-recover" ]; then - mount -t tmpfs overlay /var/lib/schroot/union/overlay -elif [ $STAGE = "setup-stop" ]; then - umount -f /var/lib/schroot/union/overlay -fi -EOF :mode #o755)) + if [ $STAGE = "setup-start" ]; then + mount -t tmpfs overlay /var/lib/schroot/union/overlay + elif [ $STAGE = "setup-recover" ]; then + mount -t tmpfs overlay /var/lib/schroot/union/overlay + elif [ $STAGE = "setup-stop" ]; then + umount -f /var/lib/schroot/union/overlay + fi + EOF :mode #o755)) (:unapply (file:does-not-exist "/etc/schroot/setup.d/04tmpfs"))) -- cgit v1.2.3