Updated extract.conf, fixed OSX install bug in setup.py

setup.py

@@ -58,10 +58,10 @@ def remove_binwalk_module(pydir=None, pybin=None):
             remove_tree(path)
         except OSError as e:
             pass
-    
+
     if not pybin:
         pybin = which(MODULE_NAME)
-    
+
     if pybin:
         try:
             print("removing '%s'" % pybin)
@@ -140,6 +140,7 @@ if "install" in sys.argv or "build" in sys.argv:
 # The data files to install along with the module
 data_dirs = ["magic", "config", "plugins", "modules", "core"]
 install_data_files = [os.path.join("libs", "*.so")]
+install_data_files = [os.path.join("libs", "*.dylib")]
 
 for data_dir in data_dirs:
     install_data_files.append("%s%s*" % (data_dir, os.path.sep))

src/binwalk/config/extract.conf

@@ -30,19 +30,21 @@
 ^squashfs filesystem:squashfs:/opt/firmware-mod-kit/unsquashfs_all.sh '%e'
 ^jffs2 filesystem:jffs2:/opt/firmware-mod-kit/src/jffs2/unjffs2 '%e'
 ^ascii cpio archive:cpio:/opt/firmware-mod-kit/uncpio.sh '%e'
-^cramfs filesystem:cramfs:/opt/firmware-mod-kit/uncramfs_all.sh '%e'
-^bff volume entry:bff:/opt/firmware-mod-kit/src/bff/bffxtractor.py '%e'
-^wdk file system:wdk:/opt/firmware-mod-kit/src/firmware-tools/unwdk.py '%e'
+#^cramfs filesystem:cramfs:/opt/firmware-mod-kit/uncramfs_all.sh '%e'
+#^bff volume entry:bff:/opt/firmware-mod-kit/src/bff/bffxtractor.py '%e'
+#^wdk file system:wdk:/opt/firmware-mod-kit/src/firmware-tools/unwdk.py '%e'
 ^zlib compressed data:zlib:/opt/firmware-mod-kit/src/firmware-tools/unzlib.py '%e'
+
+^cramfs filesystem:cramfs:mkdir cramfs-root && mount -t cramfs '%e' cramfs-root
 ^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 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'
+#^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'
 
 # Extract, but don't run anything
 private key:key