Fix for odd import error issue

meanishn · Apr 17, 2017 · 9a3e5ed · 9a3e5ed
1 parent 173ec20
commit 9a3e5ed
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Tools/Evasion/Tool.py b/Tools/Evasion/Tool.py
@@ -14,7 +14,6 @@
 from Tools.Evasion.evasion_common import evasion_helpers
 from Tools.Evasion.evasion_common import outfile
 from Tools.Evasion.evasion_common import shellcode_help
-from Tools.Ordnance import Tool as Ordnance_Import
 
 
 # try to find and import the settings.py config file
@@ -27,6 +26,9 @@
         print("\n [!] ERROR #1: run %s manually\n" % (os.path.abspath("./config/update.py")))
         sys.exit()
 
+sys.path.insert(0, settings.VEIL_EVASION_PATH + 'Tools/Ordnance')
+import Tool as Ordnance_Import
+
 
 class Tools:
 

diff --git a/Tools/Evasion/evasion_common/shellcode_help.py b/Tools/Evasion/evasion_common/shellcode_help.py
@@ -13,12 +13,21 @@
 import sys
 
 from lib.common import helpers
-from Tools.Ordnance import Tool as Ordnance_Import
 from Tools.Evasion.evasion_common import evasion_helpers
 from lib.common import completer
 
+# try to find and import the settings.py config file
+if os.path.exists("/etc/veil/settings.py"):
+    try:
+        sys.path.append("/etc/veil/")
+        import settings
 
-import settings
+    except ImportError:
+        print("\n [!] ERROR #1: run %s manually\n" % (os.path.abspath("./config/update.py")))
+        sys.exit()
+
+sys.path.insert(0, settings.VEIL_EVASION_PATH + 'Tools/Ordnance')
+import Tool as Ordnance_Import
 
 
 class Shellcode: