mirror of
https://github.com/hak5/wifipineapple-openwrt.git
synced 2025-10-29 16:57:19 +00:00
scripts/ubinize-image.sh: fix parameter handling
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41347 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -57,36 +57,39 @@ ubilayout() {
|
||||
}
|
||||
|
||||
while [ "$1" ]; do
|
||||
if [ "$1" = "--uboot-env" ]; then
|
||||
case "$1" in
|
||||
"--uboot-env")
|
||||
ubootenv="ubootenv"
|
||||
shift
|
||||
continue
|
||||
fi
|
||||
if [ "$1" = "--no-kernel" ]; then
|
||||
;;
|
||||
"--no-kernel")
|
||||
nokernel="nokernel"
|
||||
shift
|
||||
continue
|
||||
fi
|
||||
if [ ! "$kernel" -a ! "$nokernel" ]; then
|
||||
[ "${1:0:1}" = "-" ] && break
|
||||
kernel=$1
|
||||
shift
|
||||
continue
|
||||
fi
|
||||
if [ ! "$rootfs" ]; then
|
||||
[ "${1:0:1}" = "-" ] && break
|
||||
rootfs=$1
|
||||
shift
|
||||
continue
|
||||
fi
|
||||
if [ ! "$outfile" ]; then
|
||||
[ "${1:0:1}" = "-" ] && break
|
||||
outfile=$1
|
||||
shift
|
||||
continue
|
||||
fi
|
||||
ubinize_param="$@"
|
||||
break
|
||||
;;
|
||||
"-"*)
|
||||
ubinize_param="$@"
|
||||
break
|
||||
;;
|
||||
*)
|
||||
if [ ! "$kernel" -a ! "$nokernel" ]; then
|
||||
kernel=$1
|
||||
shift
|
||||
continue
|
||||
fi
|
||||
if [ ! "$rootfs" ]; then
|
||||
rootfs=$1
|
||||
shift
|
||||
continue
|
||||
fi
|
||||
if [ ! "$outfile" ]; then
|
||||
outfile=$1
|
||||
shift
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ ! -r "$rootfs" -o ! -r "$kernel" -a ! "$nokernel" -o ! "$outfile" ]; then
|
||||
|
||||
Reference in New Issue
Block a user