Re: [PATCH 22/47] bash scripts: get rid of unnessary sed calls

[Philipp Rudo]

Hi Kairui,

typo in subject s/unnessary/unnecessary/

On Thu, 12 Aug 2021 13:47:38 +0800
Kairui Song  wrote:
> Use bash builtin string substitution instead, as suggested by:
> https://github.com/koalaman/shellcheck/wiki/SC2001
> Signed-off-by: Kairui Song
>
> dracut-module-setup.sh |  8 ++++----
>  mkdumprd               | 18 ++++++++++--------
>  2 files changed, 14 insertions(+), 12 deletions(-)

[...]
> diff --git a/mkdumprd b/mkdumprd
> index 60c2fa05..ae0fe22b 100644
> --- a/mkdumprd
> +++ b/mkdumprd
> @@ -58,7 +58,7 @@ add_dracut_sshkey() {
>
> # caller should ensure $1 is valid and mounted in 1st kernel
>  to_mount() {
> local _target=$1 _fstype=$2 _options=$3 _new_mntpoint _pdev
>
> local _target=$1 _fstype=$2 _options=$3 _sed_cmd _new_mntpoint _pdev
>
> _new_mntpoint=$(get_kdump_mntpoint_from_target $_target)
> _fstype="${_fstype:-$(get_fs_type_from_target $_target)}"
>
> @@ -67,9 +67,9 @@ to_mount() {
>  if [[ "$_fstype" == "nfs"* ]]; then
>      _pdev=$_target
>    _options=$(echo $_options | sed 's/,addr=[^,]*//')
>    _options=$(echo $_options | sed 's/,proto=[^,]*//')
>    _options=$(echo $_options | sed 's/,clientaddr=[^,]*//')
>    _sed_cmd+='s/,addr=[^,]*//;'
>    _sed_cmd+='s/,proto=[^,]*//;'
>    _sed_cmd+='s/,clientaddr=[^,]*//;'
> else
>        # for non-nfs _target converting to use udev persistent name
>        _pdev="$(kdump_get_persistent_dev $_target)"
>
> @@ -79,13 +79,15 @@ to_mount() {
>      fi
>  # mount fs target as rw in 2nd kernel
> _options=$(echo $_options | sed 's/(^|,)ro($|,)/\1rw\2/g')
> _sed_cmd+='s/(^|,)ro($|,)/\1rw\2/g;'
> # with 'noauto' in fstab nfs and non-root disk mount will fail in 2nd
> # kernel, filter it out here.
> _options=$(echo $_options | sed 's/(^|,)noauto($|,)/\1/g')
> _sed_cmd+='s/(^|,)noauto($|,)/\1/g;'
> # drop nofail or nobootwait
> _options=$(echo $_options | sed 's/(^|,)nofail($|,)/\1/g')
> _options=$(echo $_options | sed 's/(^|,)nobootwait($|,)/\1/g')
> _sed_cmd+='s/(^|,)nofail($|,)/\1/g;'
> _sed_cmd+='s/(^|,)nobootwait($|,)/\1/g;'
> _options=$(echo "$_options" | sed "$_sed_cmd")

^^^^^^^^^^^
    				 why don't you use an array
    				 like in patch 9/SC2089?

Thanks
Philipp
>  echo "$_pdev $_new_mntpoint $_fstype $_options"
>
> }