KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scripts/ubinize-image.sh: fix parameter handling

Browse source 
ubinize-image.sh previously used ${var:offset:length} substitutions
which are not valid in standard shell.
Replace the existing parameter matching by a case ... esac expression.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 41347
This commit is contained in:
John Crispin 2014-06-26 11:43:42 +00:00
parent baa534a8b7
commit 0f39877bac
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
scripts/ubinize-image.sh
View file

@ -57,36 +57,39 @@ ubilayout() {
} }
while [ "$1" ]; do while [ "$1" ]; do
if [ "$1" = "--uboot-env" ]; then case "$1" in
"--uboot-env")
ubootenv="ubootenv" ubootenv="ubootenv"
shift shift
continue continue
fi ;;
if [ "$1" = "--no-kernel" ]; then "--no-kernel")
nokernel="nokernel" nokernel="nokernel"
shift shift
continue continue
fi ;;
if [ ! "$kernel" -a ! "$nokernel" ]; then "-"*)
[ "${1:0:1}" = "-" ] && break ubinize_param="$@"
kernel=$1 break
shift ;;
continue *)
fi if [ ! "$kernel" -a ! "$nokernel" ]; then
if [ ! "$rootfs" ]; then kernel=$1
[ "${1:0:1}" = "-" ] && break shift
rootfs=$1 continue
shift fi
continue if [ ! "$rootfs" ]; then
fi rootfs=$1
if [ ! "$outfile" ]; then shift
[ "${1:0:1}" = "-" ] && break continue
outfile=$1 fi
shift if [ ! "$outfile" ]; then
continue outfile=$1
fi shift
ubinize_param="$@" continue
break fi
;;
esac
done done
if [ ! -r "$rootfs" -o ! -r "$kernel" -a ! "$nokernel" -o ! "$outfile" ]; then if [ ! -r "$rootfs" -o ! -r "$kernel" -a ! "$nokernel" -o ! "$outfile" ]; then