Skip to content

Commit 38f28e1

Browse files
committed
Prepare for version 8.7.0 and other improvements
1. Version upgraded to 8.7.0 2. Updated changelog for version 8.7.0 3. Auto convert multibootusb file ending to Linux using dos2unix during packaging 4. Re-enable log message 5. Avoid crashing due to existence of syslinux.cfg
1 parent 2331f51 commit 38f28e1

File tree

6 files changed

+43
-15
lines changed

6 files changed

+43
-15
lines changed

CHANGELOG

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
1-
Version - 8.6.0
1+
Version - 8.7.0
22
---------------
3+
* Welcome "Alin Trăistaru (alindt)". He is one of the major contributor for the project
4+
* Hide GUI widgets when installation is progress
5+
* Show USB disk size in USB details
6+
* Reduced CPU usage drastically
7+
* Open default text editor application under Linux for editing syslinux file
8+
* Reduced various redundant function calls
9+
* Dropped p7zip-plugin for suse and mageia (package not available in repo)
10+
* Improved CLI user experience. Windows users should run from source to avail this option
11+
* Added custom functions for writing custom loopback.cfg file
12+
* Various code cleanup
13+
* Removed windows line ending which prevented application not to start under Linux
14+
* Corrected systemrescuecd subdir path
15+
* Full credit to and added as
16+
* Added colour to terminal output
17+
* Bundled Colorama module
18+
* Added vba32rescue ISO
19+
* Added PC Tools ISO
20+
* Few other minor improvements to code
321

22+
Version - 8.6.0
23+
---------------
424
==> A very big thanks to "Alin Trăistaru (alindt)". All credits goes to him for redesigning of GUI and code cleanups <==
525
-------------------------------------------------------------------------------------------------------------
626

build_pkg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,9 @@ def usage():
279279
sys.exit(-1)
280280

281281
if __name__ == '__main__':
282+
if platform.system() == 'Linux':
283+
print('Converting line ending to Linux for proper functioning.')
284+
os.system('dos2unix multibootusb')
282285
argv = sys.argv
283286
if not os.path.exists(release_dir):
284287
print("Release directory does not exist.\nPlease mount and rerun the script.")

data/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.6.0
1+
8.7.0

multibootusb

100644100755
File mode changed.

scripts/gen.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,16 @@ def log(message, info=True, error=False, debug=False):
4444
level=logging.DEBUG)
4545
print(message)
4646

47-
'''
4847
# remove ANSI color codes from logs
49-
message_clean = re.compile(r'\x1b[^m]*m').sub('', message)
48+
# message_clean = re.compile(r'\x1b[^m]*m').sub('', message)
5049

5150
if info is True:
52-
logging.info(message_clean)
51+
logging.info(message)
5352
elif error is not False:
54-
logging.error(message_clean)
53+
logging.error(message)
5554
elif debug is not False:
56-
logging.debug(message_clean)
57-
'''
55+
logging.debug(message)
56+
5857

5958

6059
def resource_path(relativePath):
@@ -92,7 +91,7 @@ def print_version():
9291
Simple log the version number of the multibootusb application
9392
:return:
9493
"""
95-
log('multibootusb version: ', mbusb_version())
94+
log('multibootusb version: ' + mbusb_version())
9695

9796

9897
def quote(text):
@@ -113,7 +112,7 @@ def is_quoted(text):
113112
:param text: Any word or sentence with or without quote.
114113
:return: True if text is quoted else False.
115114
"""
116-
if text.startswith("""") and text.endswith("""):
115+
if text.startswith("\"") and text.endswith("\""):
117116
return True
118117
else:
119118
return False
@@ -140,10 +139,10 @@ def mbusb_log_file():
140139
"""
141140
Function to genrate path to log file.
142141
Under linux path is created as /tmp/multibootusb.log
143-
Under Windows the file is created under
142+
Under Windows the file is created under installation directory
144143
"""
145144
if platform.system() == "Linux":
146-
home_dir = os.path.expanduser('~')
145+
# home_dir = os.path.expanduser('~')
147146
# log_file = os.path.join(home_dir, "multibootusb.log")
148147
log_file = os.path.join(tempfile.gettempdir(), "multibootusb.log")
149148
elif platform.system() == "Windows":

scripts/update_cfg_file.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,15 @@ def update_distro_cfg_files(iso_link, usb_disk, distro, persistence=0):
233233
# Ensure that isolinux.cfg file is copied as syslinux.cfg to boot correctly.
234234
for dirpath, dirnames, filenames in os.walk(install_dir):
235235
for f in filenames:
236-
if f.endswith("isolinux.cfg") or f.endswith("ISOLINUX.CFG"):
237-
if not os.path.exists(os.path.join(dirpath, "syslinux.cfg")) or not os.path.exists(os.path.join(dirpath, "SYSLINUX.CFG")):
238-
shutil.copy2(os.path.join(dirpath, f), os.path.join(dirpath, "syslinux.cfg"))
236+
if f.lower().endswith("isolinux.cfg"):
237+
if not os.path.exists(os.path.join(dirpath, "syslinux.cfg")):
238+
try:
239+
shutil.copyfile(os.path.join(dirpath, f), os.path.join(dirpath, "syslinux.cfg"))
240+
except Exception as e:
241+
log('Copying isolinux to syslinux failed...')
242+
log(e)
243+
else:
244+
continue
239245

240246
# Assertain if the entry is made..
241247
sys_cfg_file = os.path.join(config.usb_mount, "multibootusb", "syslinux.cfg")

0 commit comments

Comments
 (0)