diff options
| author | Jamey Sharp <jamey@minilop.net> | 2011-05-05 12:03:47 -0700 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2011-05-12 16:48:39 +0200 |
| commit | 153f01147065cb3628493dcb79417bc4474320c7 (patch) | |
| tree | cf5d3352b915da7c2a0274a23b61c9e7ffbe4191 /scripts | |
| parent | 43f67c98161c65f1b2e3af3a9ce6741850072c06 (diff) | |
| download | linux-stable-153f01147065cb3628493dcb79417bc4474320c7.tar.gz linux-stable-153f01147065cb3628493dcb79417bc4474320c7.tar.bz2 linux-stable-153f01147065cb3628493dcb79417bc4474320c7.zip | |
scripts/gen_initramfs_list.sh: Convert to a /bin/sh script
Replace bashisms with POSIX-compatible shell scripting.
Notably, de-duplicate '/' using a sed command from elsewhere in the same script
rather than "${name//\/\///}".
Commit by Jamey Sharp and Josh Triplett.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/gen_initramfs_list.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh index d44cf675bc22..8da7890310d6 100644 --- a/scripts/gen_initramfs_list.sh +++ b/scripts/gen_initramfs_list.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Copyright (C) Martin Schlemmer <azarah@nosferatu.za.org> # Copyright (C) 2006 Sam Ravnborg <sam@ravnborg.org> # @@ -105,9 +105,9 @@ list_parse() { # for links, devices etc the format differs. See gen_init_cpio for details parse() { local location="$1" - local name="${location/${srcdir}//}" + local name="/${location#${srcdir}}" # change '//' into '/' - name="${name//\/\///}" + name=$(echo "$name" | sed -e 's://*:/:g') local mode="$2" local uid="$3" local gid="$4" @@ -117,8 +117,8 @@ parse() { [ "$root_gid" = "squash" ] && gid=0 || [ "$gid" -eq "$root_gid" ] && gid=0 local str="${mode} ${uid} ${gid}" - [ "${ftype}" == "invalid" ] && return 0 - [ "${location}" == "${srcdir}" ] && return 0 + [ "${ftype}" = "invalid" ] && return 0 + [ "${location}" = "${srcdir}" ] && return 0 case "${ftype}" in "file") @@ -192,7 +192,7 @@ input_file() { if [ -f "$1" ]; then ${dep_list}header "$1" is_cpio="$(echo "$1" | sed 's/^.*\.cpio\(\..*\)\?/cpio/')" - if [ $2 -eq 0 -a ${is_cpio} == "cpio" ]; then + if [ $2 -eq 0 -a ${is_cpio} = "cpio" ]; then cpio_file=$1 echo "$1" | grep -q '^.*\.cpio\..*' && is_cpio_compressed="compressed" [ ! -z ${dep_list} ] && echo "$1" @@ -204,7 +204,7 @@ input_file() { else echo "$1 \\" cat "$1" | while read type dir file perm ; do - if [ "$type" == "file" ]; then + if [ "$type" = "file" ]; then echo "$file \\"; fi done |