From 35f7fa0fc2be42a4259b0ed9e5a8cca1c54764f5 Mon Sep 17 00:00:00 2001
From: devttys0 <cheffner@refirmlabs.com>
Date: Sun, 9 Jun 2019 16:06:33 -0400
Subject: [PATCH] Fixed typo in common.py
---
src/binwalk/config/extract.conf | 2 +-
src/binwalk/core/settings.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/binwalk/config/extract.conf b/src/binwalk/config/extract.conf
index 4391606..cd847c4 100644
--- a/src/binwalk/config/extract.conf
+++ b/src/binwalk/config/extract.conf
@@ -52,7 +52,7 @@
# 7z handles most zip files, but fails on some zip archives, inexplicably seeing
# only the *last* entry in the zip archive (though 7z thinks it succeeded). See
# StarCam firmware CH-sys-48.53.64.67.zip.
-^zip archive data:zip:unzip '%e':0
+^zip archive data:zip:unzip -o '%e':0
^zip archive data:zip:jar xvf '%e':0
^zip archive data:zip:7z x -y '%e' -p '':0,1
diff --git a/src/binwalk/core/settings.py b/src/binwalk/core/settings.py
index 5ca76da..c42ca1f 100644
--- a/src/binwalk/core/settings.py
+++ b/src/binwalk/core/settings.py
@@ -132,7 +132,7 @@ class Settings(object):
user_dir = os.getenv(envname)
if user_dir is not None:
return user_dir
- if os.path.expanduser("~") is Not None:
+ if os.path.expanduser("~") is not None:
return os.path.expanduser("~")
except KeyboardInterrupt as e:
raise e
--
libgit2 0.26.0