From: Masahiro Yamada <masahiroy@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Michal Marek <michal.lkml@markovi.net>,
Linux Kbuild mailing list <linux-kbuild@vger.kernel.org>,
linux-arch <linux-arch@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 02/20] kbuild: scripts/install.sh: properly quote all variables
Date: Wed, 7 Apr 2021 19:59:26 +0900 [thread overview]
Message-ID: <CAK7LNAS-F0axROr=D6QtnpZrau-rcu+Vk9JTjX0ad5EZfD_R_A@mail.gmail.com> (raw)
In-Reply-To: <20210407053419.449796-3-gregkh@linuxfoundation.org>
On Wed, Apr 7, 2021 at 2:34 PM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> A few variables are quoted to handle spaces in directory names, but not
> all of them. Properly quote everything so that the kernel build can
> handle working correctly with directory names with spaces.
>
> This change makes the script "shellcheck" clean now.
>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> scripts/install.sh | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/scripts/install.sh b/scripts/install.sh
> index d13ec1c38640..c183d6ddd00c 100644
> --- a/scripts/install.sh
> +++ b/scripts/install.sh
> @@ -33,21 +33,21 @@ verify "$3"
>
> # User may have a custom install script
>
> -if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
> -if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
> +if [ -x ~/bin/"${INSTALLKERNEL}" ]; then exec ~/bin/"${INSTALLKERNEL}" "$@"; fi
> +if [ -x /sbin/"${INSTALLKERNEL}" ]; then exec /sbin/"${INSTALLKERNEL}" "$@"; fi
>
> # Default install - same as make zlilo
>
> -if [ -f $4/vmlinuz ]; then
> - mv $4/vmlinuz $4/vmlinuz.old
> +if [ -f "$4"/vmlinuz ]; then
> + mv "$4"/vmlinuz "$4"/vmlinuz.old
> fi
Another way of quoting is doing like this:
if [ -f "$4/vmlinuz" ]; then
mv "$4/vmlinuz" "$4/vmlinuz.old"
fi
shellcheck is still satisfied.
Because you will add more quotes,
quoting the whole of each parameter might be cleaner.
See my comment in 07/20.
> -if [ -f $4/System.map ]; then
> - mv $4/System.map $4/System.old
> +if [ -f "$4"/System.map ]; then
> + mv "$4"/System.map "$4"/System.old
> fi
>
> -cat $2 > $4/vmlinuz
> -cp $3 $4/System.map
> +cat "$2" > "$4"/vmlinuz
> +cp "$3" "$4"/System.map
>
> if [ -x /sbin/lilo ]; then
> /sbin/lilo
> --
> 2.31.1
>
--
Best Regards
Masahiro Yamada
next prev parent reply other threads:[~2021-04-07 11:00 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 5:33 [PATCH 00/20] kbuild: unify the install.sh script usage Greg Kroah-Hartman
2021-04-07 5:34 ` [PATCH 01/20] kbuild: move x86 install script to scripts/install.sh Greg Kroah-Hartman
2021-04-09 3:08 ` Kees Cook
2021-04-07 5:34 ` [PATCH 02/20] kbuild: scripts/install.sh: properly quote all variables Greg Kroah-Hartman
2021-04-07 10:59 ` Masahiro Yamada [this message]
2021-04-07 5:34 ` [PATCH 03/20] kbuild: scripts/install.sh: provide a "install" function Greg Kroah-Hartman
2021-04-07 11:01 ` Masahiro Yamada
2021-04-07 5:34 ` [PATCH 04/20] kbuild: scripts/install.sh: call sync before calling the bootloader installer Greg Kroah-Hartman
2021-04-07 11:03 ` Masahiro Yamada
2021-04-07 5:34 ` [PATCH 05/20] kbuild: scripts/install.sh: prepare for arch-specific bootloaders Greg Kroah-Hartman
2021-04-09 3:08 ` Kees Cook
2021-04-07 5:34 ` [PATCH 06/20] kbuild: scripts/install.sh: handle compressed/uncompressed kernel images Greg Kroah-Hartman
2021-04-07 11:04 ` Masahiro Yamada
2021-04-07 5:34 ` [PATCH 07/20] kbuild: scripts/install.sh: allow for the version number Greg Kroah-Hartman
2021-04-07 11:05 ` Masahiro Yamada
2021-04-07 13:03 ` Greg Kroah-Hartman
2021-04-07 13:21 ` Masahiro Yamada
2021-04-07 5:34 ` [PATCH 08/20] kbuild: riscv: use common install script Greg Kroah-Hartman
2021-04-09 3:09 ` Kees Cook
2021-04-07 5:34 ` [PATCH 09/20] kbuild: arm64: " Greg Kroah-Hartman
2021-04-07 14:30 ` Catalin Marinas
2021-04-09 3:08 ` Kees Cook
2021-04-09 6:37 ` Greg Kroah-Hartman
2021-04-07 5:34 ` [PATCH 10/20] kbuild: arm: " Greg Kroah-Hartman
2021-04-09 3:09 ` Kees Cook
2021-04-07 5:34 ` [PATCH 11/20] kbuild: ia64: " Greg Kroah-Hartman
2021-04-07 18:02 ` Sergei Trofimovich
2021-04-09 3:10 ` Kees Cook
2021-04-07 5:34 ` [PATCH 12/20] kbuild: m68k: " Greg Kroah-Hartman
2021-04-07 7:19 ` Geert Uytterhoeven
2021-04-09 3:10 ` Kees Cook
2021-04-07 5:34 ` [PATCH 13/20] kbuild: nds32: convert to use the common install scripts Greg Kroah-Hartman
2021-04-07 11:20 ` Masahiro Yamada
2021-04-07 5:34 ` [PATCH 14/20] kbuild: nios2: use common install script Greg Kroah-Hartman
2021-04-09 3:09 ` Kees Cook
2021-04-07 5:34 ` [PATCH 15/20] kbuild: parisc: " Greg Kroah-Hartman
2021-04-07 11:23 ` Masahiro Yamada
2021-04-14 16:30 ` Helge Deller
2021-04-14 17:51 ` Greg Kroah-Hartman
2021-04-07 5:34 ` [PATCH 16/20] kbuild: powerpc: " Greg Kroah-Hartman
2021-04-07 11:32 ` Masahiro Yamada
2021-04-07 5:34 ` [PATCH 17/20] kbuild: s390: " Greg Kroah-Hartman
2021-04-07 12:15 ` Heiko Carstens
2021-04-09 3:10 ` Kees Cook
2021-04-07 5:34 ` [PATCH 18/20] kbuild: sh: remove unused " Greg Kroah-Hartman
2021-04-09 3:09 ` Kees Cook
2021-08-24 15:22 ` Masahiro Yamada
2021-08-27 14:02 ` Greg Kroah-Hartman
2021-04-07 5:34 ` [PATCH 19/20] kbuild: sparc: use common " Greg Kroah-Hartman
2021-04-09 3:09 ` Kees Cook
2021-04-07 5:34 ` [PATCH 20/20] kbuild: scripts/install.sh: update documentation Greg Kroah-Hartman
2021-04-07 11:45 ` Masahiro Yamada
2021-04-07 7:18 ` [PATCH 00/20] kbuild: unify the install.sh script usage Geert Uytterhoeven
2021-04-07 7:46 ` Greg Kroah-Hartman
2021-04-07 8:02 ` Russell King - ARM Linux admin
2021-04-07 8:07 ` Greg Kroah-Hartman
2021-04-07 8:14 ` Russell King - ARM Linux admin
2021-04-07 8:37 ` Greg Kroah-Hartman
2021-04-07 10:53 ` Masahiro Yamada
2021-04-09 3:12 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAK7LNAS-F0axROr=D6QtnpZrau-rcu+Vk9JTjX0ad5EZfD_R_A@mail.gmail.com' \
--to=masahiroy@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).