Updated to use binwalk-1.0.

git-svn-id: http://firmware-mod-kit.googlecode.com/svn/trunk@389 5c1471b0-2a1b-0410-b4f4-f33460ac40b9

Author: heffnercj

extract-ng.sh

@@ -66,7 +66,8 @@ echo "Scanning firmware..."
 
 # Log binwalk results to the ${BINLOG} file, disable default filters, exclude invalid results,
 # and search only for trx, uimage, dlob, squashfs, and cramfs results.
-${BINWALK} -f "${BINLOG}" -d -x invalid -y trx -y uimage -y dlob -y squashfs -y cramfs "${IMG}"
+#${BINWALK} -f "${BINLOG}" -d -x invalid -y trx -y uimage -y dlob -y squashfs -y cramfs "${IMG}"
+${BINWALK} -f "${BINLOG}" "${IMG}"
 
 # Set Internal Field Separator (IFS) via two lines to newline only (bashism would be $'\n')
 IFS='

shared-ng.inc

@@ -8,4 +8,4 @@ FSIMG="$IMAGE_PARTS/rootfs.img"
 HEADER_IMAGE="$IMAGE_PARTS/header.img"
 FOOTER_IMAGE="$IMAGE_PARTS/footer.img"
 FWOUT="$DIR/new-firmware.bin"
-BINWALK="./src/binwalk -m ./src/binwalk*/src/magic.binwalk"
+BINWALK="./src/binwalk-1.0/src/bin/binwalk-script -v -m ./src/binwalk-1.0/src/binwalk/magic/binwalk"