From 261358a3c093002af8d7ed2405ee64b0bcd8b555 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 22 Feb 2021 15:41:06 +0200 Subject: Fix formatting in bash guide --- doc/bash-style.cli | 3 ++- doc/release.cli | 4 ++++ stage | 13 +++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/doc/bash-style.cli b/doc/bash-style.cli index 3f620f4..4edc984 100644 --- a/doc/bash-style.cli +++ b/doc/bash-style.cli @@ -253,10 +253,11 @@ rm -f \"$dir/$name\".* Note also that globbing is not performed in the \c{[[ ]]} context so this is ok: +\ if [[ -v array[0] ]]; then ... fi - +\ \N|One exception to this quoting rule is arithmetic expansion (\c{$((\ ))}): Bash treats it as if it was double-quoted and, as a result, any inner quoting diff --git a/doc/release.cli b/doc/release.cli index 9a83a44..92d799e 100644 --- a/doc/release.cli +++ b/doc/release.cli @@ -52,6 +52,10 @@ distribution from \c{etc/stage} and add the pre-distributed packages copyright update notification via a pre-commit hook. So perhaps this step can be removed. +\h#install-times|Update install script times.| + + See c{private/install/build2-times.txt} for instructions. + \h#etc|Update \c{etc/git/modules}| Review for any new modules. Remove \c{etc/} and \c{private/} from diff --git a/stage b/stage index 915a93e..ab2722b 100755 --- a/stage +++ b/stage @@ -33,7 +33,7 @@ bpkg --version >/dev/null bdep --version >/dev/null # Make sure the build system if up to date (otherwise update will be triggered -# by libbuild2-hello distribution). +# by libbuild2-* module distribution). # b build2/build2/ b --version >/dev/null @@ -302,8 +302,9 @@ etc/stage-pkg -c $mode -d libstudxml ../studxml/libstudxml etc/stage-pkg -c $mode -d hello hello/libhello-1.0 -etc/stage-pkg -c $mode -d kconfig packaging/kconfig/kconfig/liblkc -etc/stage-pkg -c $mode -d kconfig packaging/kconfig/kconfig/kconfig-conf +etc/stage-pkg -c $mode -d kconfig packaging/kconfig/kconfig/liblkc \ + packaging/kconfig/kconfig/kconfig-conf \ + packaging/kconfig/kconfig/kconfig-qconf # For testing we also stage other libodb-*. # @@ -333,6 +334,6 @@ etc/stage-pkg -c $mode build2 \ openssl-agent \ libbuild2-hello/libbuild2-hello \ libbuild2-hello/libbuild2-hello-tests \ - -# libbuild2-kconfig/libbuild2-kconfig \ -# libbuild2-kconfig/libbuild2-kconfig-tests + libbuild2-kconfig/kconfig-hello \ + libbuild2-kconfig/libbuild2-kconfig \ + libbuild2-kconfig/libbuild2-kconfig-tests -- cgit v1.1