Merge branch 'devel' of https://github.com/mbusb/multibootusb.git into devel

Author: mbusb

CHANGELOG

@@ -1,3 +1,20 @@
+Version - 8.7.1
+---------------
+* Warning text under 'Write image to disk' tab
+* Fix for rpm based distro which did not run due to import error
+* Fix for suse package and it now checks for correct package dependencies
+* Copy only multibootusb directory to USB if user accept installation choice
+* Display human readable size for an ISO in terminal
+* New command line option to skip confirmation message 'try multibootusb -c -h' for more details
+* New command line option to install multiple distros at a time (Windows user should be able to run only under source code)
+* Fix for crash when installing under Install syslinux tab
+* Prevent read only filesystem under Linux
+* Corrected setup file copy location preventing crash
+* Improved multibootusb-pkexec script for working under rpm and deb based distros
+* Create correct policy file during build time for various packages
+* Improved user guide at http://multibootusb.org/page_guide/
+* Various code cleanups
+
 Version - 8.7.0
 ---------------
 * Welcome "Alin Trăistaru (alindt)". He is one of the major contributor for the project

build_pkg

@@ -118,7 +118,9 @@ class pkg():
         elif self.pkg_name == 'rpm' or self.pkg_name == 'suse' or self.pkg_name == 'mageia':
             print('Modifying policy file for rpm packages...')
             coorect_bin_path('org.debian.pkexec.run-multibootusb.policy', debian_bin_path, rpm_bin_path)
-            if self.pkg_name == 'suse' or self.pkg_name == 'mageia':
+            if self.pkg_name == 'suse':
+                require = "python3-qt5, parted, util-linux, mtools, dbus-1-python3, python3-pyudev, p7zip, python3-six"
+            elif  self.pkg_name == 'mageia':
                 require = "python3-qt5, parted, util-linux, mtools, python3-dbus, python3-pyudev, p7zip, python3-six"
             else:
                 require = "python3-PyQt5, parted, util-linux, mtools, python3-dbus, python3-pyudev, p7zip, p7zip-plugins, python3-six"

data/version.txt

@@ -1 +1 @@
-8.7.0
+8.7.1

multibootusb

@@ -12,6 +12,10 @@ import sys
 import os
 import platform
 
+# The following line is required for distros based on rpm so as to avoid import errors when running from installed system
+sys.path.append('/usr/local/lib/python3.4/dist-packages')
+# print(sys.path)
+
 # Had trouble in importing scripts directory. Had to add few lines below to ensure it works on source as well as
 # post install
 try:
@@ -32,6 +36,16 @@ gui = True
 uninstall = False
 
 
+def running_from():
+    """
+    Print version and path location (installed or source code) info for debugging later.
+    """
+    if os.path.exists('scripts'):
+        gen.log('Running multibootusb version ' + gen.mbusb_version() + ' from source...')
+    else:
+        gen.log('Running multibootusb version ' + gen.mbusb_version() + ' from installed system...')
+
+
 def usage():
     print('\n An advanced multiboot live usb creator using command line.')
     print('\n Usage: python3 multibootusb [option(s)]\n')
@@ -67,6 +81,7 @@ def start_gui():
 
 
 if __name__ == '__main__':
+    running_from()
     if platform.system() == 'Windows':
         if not admin.isUserAdmin():
             admin.runAsAdmin()

scripts/_7zip.py

@@ -80,7 +80,7 @@ def list_iso(iso_link, suppress_out=True):
             if '.....' in line:
                 if gen.has_digit(line[2]) or gen.has_digit(line[4]):
                     if len(line) > 6:
-                        f_path = " ".join(line[5:len(line)])
+                        f_path = " ".join(line[5:])
                         file_list.append(f_path)
                     else:
                         f_path = line[-1]
@@ -115,10 +115,7 @@ def test_iso(iso_link, suppress_out=True):
 
     rc = subprocess.call(_cmd, shell=True)
 
-    if rc == 0 or rc == 1:
-        return True
-    else:
-        return False
+    return bool(rc in [0, 1])
 
 
 if __name__ == '__main__':

scripts/admin.py

@@ -86,7 +86,10 @@ def runAsAdmin(cmdLine=None, wait=True):
     #    raise RuntimeError, "This function is only implemented on Windows."
     if platform.system() == "Windows":
 
-        import win32api, win32con, win32event, win32process
+        import win32api
+        import win32con
+        import win32event
+        import win32process
         from win32com.shell.shell import ShellExecuteEx
         from win32com.shell import shellcon
 

scripts/gen.py

@@ -112,10 +112,7 @@ def is_quoted(text):
     :param text:    Any word or sentence with or without quote.
     :return:        True if text is quoted else False.
     """
-    if text.startswith("\"") and text.endswith("\""):
-        return True
-    else:
-        return False
+    return bool(text.startswith("\"") and text.endswith("\""))
 
 
 def has_digit(word):
@@ -266,10 +263,8 @@ def size_not_enough(iso_link, usb_disk):
     isoSize = iso_size(iso_link)
     usb_details = details(usb_disk)
     usb_size = usb_details['size_free']
-    if isoSize > usb_size:
-        return True
-    else:
-        return False
+
+    return bool(isoSize > usb_size)
 
 
 def mbusb_version():
@@ -339,12 +334,12 @@ def prepare_mbusb_host_dir():
         log("Removing junk files...")
         for files in os.listdir(os.path.join(home, "iso_cfg_ext_dir")):
             if os.path.isdir(os.path.join(os.path.join(home, "iso_cfg_ext_dir", files))):
-                log (os.path.join(os.path.join(home, "iso_cfg_ext_dir", files)))
+                log(os.path.join(os.path.join(home, "iso_cfg_ext_dir", files)))
                 os.chmod(os.path.join(os.path.join(home, "iso_cfg_ext_dir", files)), 0o777)
                 shutil.rmtree(os.path.join(os.path.join(home, "iso_cfg_ext_dir", files)))
             else:
                 try:
-                    log (os.path.join(os.path.join(home, "iso_cfg_ext_dir", files)))
+                    log(os.path.join(os.path.join(home, "iso_cfg_ext_dir", files)))
                     os.chmod(os.path.join(os.path.join(home, "iso_cfg_ext_dir", files)), 0o777)
                     os.unlink(os.path.join(os.path.join(home, "iso_cfg_ext_dir", files)))
                     os.remove(os.path.join(os.path.join(home, "iso_cfg_ext_dir", files)))

scripts/grub.py

@@ -11,6 +11,7 @@
 from . import iso
 from . import _7zip
 from . import gen
+from .usb import bytes2human
 
 
 def mbusb_update_grub_cfg():
@@ -141,9 +142,9 @@ def get_grub_cfg(iso_link, efi=True):
 
 
 def grub_custom_menu(mbus_grub_cfg_path, distro):
-    iso_size_mb = iso.iso_size(config.image_path) / (1024.0 * 1024.0)
+    iso_size_mb = bytes2human(iso.iso_size(config.image_path))
     gen.log('size of the ISO is ' + str(iso_size_mb))
-    if distro == 'sgrubd2' or distro == 'raw_iso':
+    if distro in ['sgrubd2', 'raw_iso']:
         grub_raw_iso(mbus_grub_cfg_path)
 
         '''

scripts/gui/multibootusb.ui

@@ -308,7 +308,7 @@
        <bool>false</bool>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <widget class="QWidget" name="tab_multibootusb">
        <property name="enabled">
@@ -483,7 +483,7 @@
           <property name="bottomMargin">
            <number>5</number>
           </property>
-          <item row="1" column="2">
+          <item row="3" column="2">
            <spacer name="horizontalSpacer_7">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
@@ -496,14 +496,14 @@
             </property>
            </spacer>
           </item>
-          <item row="1" column="1">
+          <item row="3" column="1">
            <widget class="QPushButton" name="button_write_image_to_disk">
             <property name="text">
              <string>Write image to USB</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="3" colspan="2">
+          <item row="3" column="3" colspan="2">
            <widget class="QWidget" name="widget_7" native="true">
             <layout class="QVBoxLayout" name="verticalLayout_6">
              <property name="leftMargin">
@@ -521,7 +521,7 @@
             </layout>
            </widget>
           </item>
-          <item row="1" column="0">
+          <item row="3" column="0">
            <spacer name="horizontalSpacer_5">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
@@ -534,8 +534,28 @@
             </property>
            </spacer>
           </item>
+          <item row="4" column="1">
+           <spacer name="verticalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLabel" name="label_6">
+            <property name="text">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600; color:#ff0000;&quot;&gt;WARNING!&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#000000;&quot;&gt;This operation destroys &lt;/span&gt;&lt;span style=&quot; font-weight:600; color:#000000;&quot;&gt;ALL&lt;/span&gt;&lt;span style=&quot; color:#000000;&quot;&gt; data on the selected disk.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#000000;&quot;&gt;Please select the destination disk carefully.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="1">
-           <spacer name="verticalSpacer_4">
+           <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
@@ -548,7 +568,7 @@
            </spacer>
           </item>
           <item row="2" column="1">
-           <spacer name="verticalSpacer_2">
+           <spacer name="verticalSpacer_4">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>