Updated extraction rules to include sasquatch

README.md

@@ -15,13 +15,7 @@ $ make
 $ sudo make install
 ```
 
-For convenience, optional dependencies for automatic extraction and graphical visualizations can be installed by running the included `deps.sh` script:
-
-```bash
-$ ./deps.sh
-```
-
-If your system is not supported by `deps.sh`, or if you wish to manually install dependencies, see `INSTALL.md`.
+For instructions on installing optional dependencies, see `INSTALL.md`.
 
 For advanced installation options, see `INSTALL.md`.
 

src/binwalk/config/extract.conf

 #################################################################################################################
 # Default extract rules loaded when --extract is specified.
 # 
-# <case-insensitive unique string from binwalk output text>:<desired file extension>:<command to execute>
+# <lower-case unique string from binwalk output text>:<desired file extension>:<command to execute>
 #
 # Note that %e is a place holder for the extracted file name.
 #################################################################################################################
@@ -21,6 +21,10 @@
 ^iso 9660:iso:7z x '%e' -oiso-root
 ^microsoft cabinet archive:cab:cabextract '%e'
 
+# Try sasquatch first, or if not installed, the standard unsquashfs
+^squashfs filesystem:squashfs:sasquatch '%e'
+^squashfs filesystem:squashfs:unsquashfs '%e'
+
 # These assume the firmware-mod-kit is installed to /opt/firmware-mod-kit.
 # If not, change the file paths appropriately.
 ^squashfs filesystem:squashfs:/opt/firmware-mod-kit/unsquashfs_all.sh '%e'
@@ -33,17 +37,13 @@
 ^ext2 filesystem:ext2:mkdir ext2-root && mount -t ext2 '%e' ext2-root
 ^romfs filesystem:romfs:mkdir romfs-root && mount -t romfs '%e' romfs-root
 
-# These paths are for the depreciated firmware-mod-kit file paths, which included the 'trunk' directory.
-# These will only be run if the above file paths don't exist.
+# These will only be run if the above file paths don't exist / don't work.
 ^squashfs filesystem:squashfs:/opt/firmware-mod-kit/trunk/unsquashfs_all.sh '%e'
 ^jffs2 filesystem:jffs2:/opt/firmware-mod-kit/trunk/src/jffs2/unjffs2 '%e' # requires root
 ^ascii cpio archive:cpio:/opt/firmware-mod-kit/trunk/uncpio.sh '%e'
 ^cramfs filesystem:cramfs:/opt/firmware-mod-kit/trunk/uncramfs_all.sh '%e'
 ^bff volume entry:bff:/opt/firmware-mod-kit/trunk/src/bff/bffxtractor.py '%e'
 
-# If FMK isn't installed, try the system's unsquashfs for SquashFS files
-^squashfs filesystem:squashfs:unsquashfs '%e'
-
 # Extract, but don't run anything
 private key:key
 certificate:crt