diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-30 11:57:47 +0100 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-30 11:57:47 +0100 |
| commit | b4156e146f83474a9cb1aca9117a4a4053c62683 (patch) | |
| tree | a200a44212762a26b0bef9c1f3eb1db3d033cb66 | |
| parent | 9d5665c6274cfd1052e9c16a3a1708d8f91b58da (diff) | |
| download | vyos-live-build-b4156e146f83474a9cb1aca9117a4a4053c62683.tar.gz vyos-live-build-b4156e146f83474a9cb1aca9117a4a4053c62683.zip | |
workaround checkbashisms mistake
it reported: "possible bashism in scripts/build/binary_loopback_cfg line 284 (should be '.', not 'source')"
which is clearly a misidentification.
Gbp-Dch: Ignore
| -rwxr-xr-x | scripts/build/binary_loopback_cfg | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg index 6666e6e8b..58fa854e3 100755 --- a/scripts/build/binary_loopback_cfg +++ b/scripts/build/binary_loopback_cfg @@ -245,6 +245,10 @@ escape_for_sed() { echo -n "$1" | perl -npe 's/\n/\\n/gm' } +# These must be held in variables to avoid mistake by checkbashisms +LINUX_INSTALL="source /boot/grub/install_start.cfg" +LINUX_ADVANCED_INSTALL="source /boot/grub/install.cfg" + # Those without '@' markers are for backwards compatibility sed -i \ -e "s|@LINUX_LIVE@|$(escape_for_sed "${LINUX_LIVE}")|" \ @@ -266,8 +270,8 @@ sed -i \ -e "s|@MEMTEST_BIN@|${MEMTEST_BIN}|" \ -e "s|@MEMTEST_VERSION@|${LB_MEMTEST}|" \ -e "s|LINUX_LIVE|$(escape_for_sed "${LINUX_LIVE}")|" \ - -e "s|LINUX_INSTALL|source /boot/grub/install_start.cfg|" \ - -e "s|LINUX_ADVANCED_INSTALL|source /boot/grub/install.cfg|" \ + -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" \ + -e "s|LINUX_ADVANCED_INSTALL|${LINUX_ADVANCED_INSTALL}|" \ -e "s|MEMTEST|${MEMTEST}|" \ -e "s|KERNEL_GI|${KERNEL_GI}|" \ -e "s|INITRD_GI|${INITRD_GI}|" \ |