Merge pull request #1153 from Johann-PLW/main

Update version to 2.2.0

Author: Johann-PLW

ileappGUI.py

@@ -243,10 +243,13 @@ def process(casedata):
                 report_path = report_path[2:]
             progress_bar.grid_remove()
             if lava_only:
+                message = "You have selected artifacts that are likely to return too much data "
+                message += "to be viewed in a Web browser.\n\n"
+                message += "Please see the 'LAVA only artifacts' tab in the HTML report for a list of these artifacts "
+                message += "and instructions on how to view them."
                 tk_msgbox.showwarning(
                     title="Important information",
-                    message="You have selected artifacts that are likely to return too much data to be viewed in a Web browser.\n\n\
-                        Please see the 'LAVA only artifacts' tab in the HTML report for a list of these artifacts and instructions on how to view them.",
+                    message=message,
                     parent=main_window)
             open_report_button = ttk.Button(main_window, text='Open Report & Close', command=lambda: open_report(report_path))
             open_report_button.grid(ipadx=8)

scripts/pyinstaller/ileapp-file_version_info.txt

@@ -1,7 +1,7 @@
 VSVersionInfo(
   ffi=FixedFileInfo(
-    filevers=(2, 1, 3, 0),
-    prodvers=(2, 1, 3, 0),
+    filevers=(2, 2, 0, 0),
+    prodvers=(2, 2, 0, 0),
     mask=0x3f,
     flags=0x0,
     OS=0x40004,
@@ -16,12 +16,12 @@ VSVersionInfo(
         '040904b0',
         [StringStruct('CompanyName', 'Alexis Brignoni'),
         StringStruct('FileDescription', 'iLEAPP CLI'),
-        StringStruct('FileVersion', '2.1.3'),
+        StringStruct('FileVersion', '2.2.0'),
         StringStruct('InternalName', 'iLEAPP'),
         StringStruct('LegalCopyright', 'Result of a collaborative effort in the DFIR community.'),
         StringStruct('OriginalFilename', 'ileapp.exe'),
         StringStruct('ProductName', 'iLEAPP'),
-        StringStruct('ProductVersion', '2.1.3')])
+        StringStruct('ProductVersion', '2.2.0')])
       ]), 
     VarFileInfo([VarStruct('Translation', [1033, 1200])])
   ]

scripts/pyinstaller/ileapp.spec

@@ -11,6 +11,7 @@ a = Analysis(['..\\..\\ileapp.py'],
                 'bencoding',
                 'blackboxprotobuf',
                 'Crypto.Cipher.AES',
+                'ijson',
                 'lib2to3.refactor',
                 'liblzfse',
                 'mdplist',

scripts/pyinstaller/ileappGUI-file_version_info.txt

@@ -1,7 +1,7 @@
 VSVersionInfo(
   ffi=FixedFileInfo(
-    filevers=(2, 1, 3, 0),
-    prodvers=(2, 1, 3, 0),
+    filevers=(2, 2, 0, 0),
+    prodvers=(2, 2, 0, 0),
     mask=0x3f,
     flags=0x0,
     OS=0x40004,
@@ -16,12 +16,12 @@ VSVersionInfo(
         '040904b0',
         [StringStruct('CompanyName', 'Alexis Brignoni'),
         StringStruct('FileDescription', 'iLEAPP GUI'),
-        StringStruct('FileVersion', '2.1.3'),
+        StringStruct('FileVersion', '2.2.0'),
         StringStruct('InternalName', 'iLEAPP'),
         StringStruct('LegalCopyright', 'Result of a collaborative effort in the DFIR community.'),
         StringStruct('OriginalFilename', 'ileappGUI.exe'),
         StringStruct('ProductName', 'iLEAPP'),
-        StringStruct('ProductVersion', '2.1.3')])
+        StringStruct('ProductVersion', '2.2.0')])
       ]), 
     VarFileInfo([VarStruct('Translation', [1033, 1200])])
   ]

scripts/pyinstaller/ileappGUI.spec

@@ -11,6 +11,7 @@ a = Analysis(['..\\..\\ileappGUI.py'],
                 'bencoding',
                 'blackboxprotobuf',
                 'Crypto.Cipher.AES',
+                'ijson',
                 'lib2to3.refactor',
                 'liblzfse',
                 'mdplist',
@@ -41,8 +42,8 @@ exe = EXE(pyz,
           strip=False,
           upx=True,
           console=True,
-	      hide_console='hide-early',
-	      disable_windowed_traceback=False,
+	       hide_console='hide-early',
+	       disable_windowed_traceback=False,
           upx_exclude=[],
           version='ileappGUI-file_version_info.txt',
           runtime_tmpdir=None )

scripts/pyinstaller/ileappGUI_macOS.spec

@@ -11,6 +11,7 @@ a = Analysis(
         'bencoding',
         'blackboxprotobuf',
         'Crypto.Cipher.AES',
+        'ijson',
         'lib2to3.refactor',
         'liblzfse',
         'mdplist',
@@ -60,5 +61,5 @@ app = BUNDLE(
     name='ileappGUI.app',
     icon='../../assets/icon.icns',
     bundle_identifier='4n6.brigs.iLEAPP',
-    version='2.1.3'
+    version='2.2.0'
 )

scripts/pyinstaller/ileapp_macOS.spec

@@ -11,6 +11,7 @@ a = Analysis(
         'bencoding',
         'blackboxprotobuf',
         'Crypto.Cipher.AES',
+        'ijson',
         'lib2to3.refactor',
         'liblzfse',
         'mdplist',

scripts/version_info.py

@@ -1,5 +1,5 @@
 
-ileapp_version = '2.1.3'
+ileapp_version = '2.2.0'
 
 # Contributors List
 # Format = [ Name, Blog-url, Twitter-handle, Github-url]