efibootdude 0.3__tar.gz → 0.5.1__tar.gz

{efibootdude-0.3/src/efibootdude.egg-info → efibootdude-0.5.1}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: efibootdude
-Version: 0.3
+Version: 0.5.1
 Summary: A visual wrapper for efibootmgr
-Author-email: Joe Defen <joedef@google.com>
+Author-email: Joe Defen <joedef@duck.com>
 License: MIT
 Project-URL: Homepage, https://github.com/joedefen/efibootdude
 Project-URL: Bug Tracker, https://github.com/joedefen/efibootdude/issues
@@ -41,23 +41,27 @@ After running `efibootdude` and making some changes, you'll see a screen compara
 ![efibootdude-screenshot](https://github.com/joedefen/efibootdude/blob/main/images/efibootdude-screenshot.png?raw=true).
 
 At this point
-* The current line starts with `>` and is highlighted.
+* The "current" line starts with `>` and is highlighted.
 * The top line shows actions for the current line; type the underscored letter
-  to effect the action.
-* Enter `?` for a more complete explanation of the keys, navigation keys, etc.
+  to effect its action.
+* Type `?` for a more complete explanation of the keys, navigation keys, etc.
   * **ALWAYS** view the help at least once if unfamiliar with this tool,
     it navigation, and/or uncertain of keys not shown on top line.
 * With this current line, we can:
-  * Use `u` or `d` to move it up or down in the boot order.
-  * Use `t` to relabel the boot entry.
-  * Use `r` to remove it.
+  * Type `u` or `d` to move it up or down in the boot order.
+  * Type `t` to relabel the boot entry.
+  * Type `r` to remove the boot entry.
   * And so forth.
 * The entries with `*` on the left are active boot entries; toggle whether
-  active by pressing `*`.
-* Use the `ESC` key to abandon any changes and reload the boot information.
+  active by typing `*` for the corresponding entries.
+* Press `ESC` key to abandon any changes and reload the boot information.
 * When ready to write the changes to the BIOS, enter `w`.
 * When writing the changes, `efibootdude` drops out of menu mode so you can
   verify the underlying commands, error codes, and error messages.
+* After you write changes, type `b` to reboot, if you wish and the boot menu looks OK.
+* BTW, the top-line keys vary per context; e.g.:
+  * `w` is only shown with pending changes, and
+  * `b` is only shown w/o pending changes.
 
 ## Caveats
 * Some operations may not work permanently even though there is no indication from `efibootmgr`

{efibootdude-0.3 → efibootdude-0.5.1}/README.md

@@ -23,23 +23,27 @@ After running `efibootdude` and making some changes, you'll see a screen compara
 ![efibootdude-screenshot](https://github.com/joedefen/efibootdude/blob/main/images/efibootdude-screenshot.png?raw=true).
 
 At this point
-* The current line starts with `>` and is highlighted.
+* The "current" line starts with `>` and is highlighted.
 * The top line shows actions for the current line; type the underscored letter
-  to effect the action.
-* Enter `?` for a more complete explanation of the keys, navigation keys, etc.
+  to effect its action.
+* Type `?` for a more complete explanation of the keys, navigation keys, etc.
   * **ALWAYS** view the help at least once if unfamiliar with this tool,
     it navigation, and/or uncertain of keys not shown on top line.
 * With this current line, we can:
-  * Use `u` or `d` to move it up or down in the boot order.
-  * Use `t` to relabel the boot entry.
-  * Use `r` to remove it.
+  * Type `u` or `d` to move it up or down in the boot order.
+  * Type `t` to relabel the boot entry.
+  * Type `r` to remove the boot entry.
   * And so forth.
 * The entries with `*` on the left are active boot entries; toggle whether
-  active by pressing `*`.
-* Use the `ESC` key to abandon any changes and reload the boot information.
+  active by typing `*` for the corresponding entries.
+* Press `ESC` key to abandon any changes and reload the boot information.
 * When ready to write the changes to the BIOS, enter `w`.
 * When writing the changes, `efibootdude` drops out of menu mode so you can
   verify the underlying commands, error codes, and error messages.
+* After you write changes, type `b` to reboot, if you wish and the boot menu looks OK.
+* BTW, the top-line keys vary per context; e.g.:
+  * `w` is only shown with pending changes, and
+  * `b` is only shown w/o pending changes.
 
 ## Caveats
 * Some operations may not work permanently even though there is no indication from `efibootmgr`

{efibootdude-0.3 → efibootdude-0.5.1}/pyproject.toml

@@ -55,10 +55,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "efibootdude"
-version = "0.3"
+version = "0.5.1"
 description = "A visual wrapper for efibootmgr"
 authors = [
-    { name = "Joe Defen", email = "joedef@google.com" }
+    { name = "Joe Defen", email = "joedef@duck.com" }
 ]
 readme = "README.md"
 license = { text = "MIT" }

{efibootdude-0.3 → efibootdude-0.5.1}/src/efibootdude/main.py

@@ -18,6 +18,7 @@ from types import SimpleNamespace
 import subprocess
 import traceback
 import curses as cs
+import argparse
 # import xml.etree.ElementTree as ET
 from efibootdude.PowerWindow import Window, OptionSpinner
 
@@ -37,7 +38,7 @@ class EfiBootDude:
         spin.add_key('verbose', 'v - toggle verbose', vals=[False, True])
 
         # FIXME: keys
-        other = 'tudrnmw*zqx'
+        other = 'btudrnmw*zqx'
         other_keys = set(ord(x) for x in other)
         other_keys.add(cs.KEY_ENTER)
         other_keys.add(27) # ESCAPE
@@ -221,6 +222,17 @@ class EfiBootDude:
         words = line.split(maxsplit=1)
         return words[0]
 
+    def reboot(self):
+        """ Reboot the machine """
+        Window.stop_curses()
+        os.system('clear; stty sane; (set -x; sudo reboot now)')
+
+        # NOTE: probably will not get here...
+        os.system(r'/bin/echo -e "\n\n===== Press ENTER for menu ====> \c"; read FOO')
+        self.reinit()
+        Window._start_curses()
+        self.win.pick_pos = self.boot_idx
+
     def write(self):
         """ Commit the changes. """
         if not self.mods.dirty:
@@ -262,8 +274,6 @@ class EfiBootDude:
         Window._start_curses()
         self.win.pick_pos = self.boot_idx
 
-
-
     def main_loop(self):
         """ TBD """
 
@@ -287,6 +297,7 @@ class EfiBootDude:
                     '   m - modify - modify the value'
                     '   w - write - write the changes',
                     '   ESC - abandon changes and re-read boot state',
+                    '   b - reboot the machine',
                 ]
                 for line in lines:
                     self.win.put_body(line)
@@ -347,6 +358,8 @@ class EfiBootDude:
                 actions['m'] = 'modify'
             if self.mods.dirty:
                 actions['w'] = 'write'
+            else:
+                actions['b'] = 'boot'
 
         return actions
 
@@ -386,7 +399,7 @@ class EfiBootDude:
             return value
 
         if key in (ord('q'), ord('x')):
-            
+
             answer = 'y'
             if self.mods.dirty:
                 answer = self.win.answer(
@@ -462,7 +475,7 @@ class EfiBootDude:
         if key == ord('t') and ns.is_boot:
             seed = ns.label
             while True:
-                answer = self.win.answer(prompt='Enter new label or clear to abort',
+                answer = self.win.answer(prompt='Type new label or clear to abort',
                     seed=seed, width=80)
                 seed = answer = answer.strip()
                 if not answer:
@@ -476,7 +489,7 @@ class EfiBootDude:
         if key == 27:  # ESC
             if self.mods.dirty:
                 answer = self.win.answer(
-                    prompt='Enter "y" to clear edits and refresh')
+                    prompt='Type "y" to clear edits and refresh')
                 if answer.strip().lower().startswith('y'):
                     self.reinit()
             else:
@@ -487,13 +500,22 @@ class EfiBootDude:
             self.write()
             return None
 
-        # FIXME: handle more keys 
+        if key == ord('b'):
+            if self.mods.dirty:
+                self.win.alert('Pending changes (on return, use "w" to commit or "ESC" to discard)')
+                return
+            
+            answer = self.win.answer(prompt='Type "reboot" to reboot',
+                    seed='reboot', width=80)
+            if answer.strip().lower().startswith('reboot'):
+                self.reboot()
+
+        # FIXME: handle more keys
         return None
 
 
 def main():
     """ The program """
-    import argparse
     parser = argparse.ArgumentParser()
     parser.add_argument('testfile', nargs='?', default=None)
     opts = parser.parse_args()

{efibootdude-0.3 → efibootdude-0.5.1/src/efibootdude.egg-info}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: efibootdude
-Version: 0.3
+Version: 0.5.1
 Summary: A visual wrapper for efibootmgr
-Author-email: Joe Defen <joedef@google.com>
+Author-email: Joe Defen <joedef@duck.com>
 License: MIT
 Project-URL: Homepage, https://github.com/joedefen/efibootdude
 Project-URL: Bug Tracker, https://github.com/joedefen/efibootdude/issues
@@ -41,23 +41,27 @@ After running `efibootdude` and making some changes, you'll see a screen compara
 ![efibootdude-screenshot](https://github.com/joedefen/efibootdude/blob/main/images/efibootdude-screenshot.png?raw=true).
 
 At this point
-* The current line starts with `>` and is highlighted.
+* The "current" line starts with `>` and is highlighted.
 * The top line shows actions for the current line; type the underscored letter
-  to effect the action.
-* Enter `?` for a more complete explanation of the keys, navigation keys, etc.
+  to effect its action.
+* Type `?` for a more complete explanation of the keys, navigation keys, etc.
   * **ALWAYS** view the help at least once if unfamiliar with this tool,
     it navigation, and/or uncertain of keys not shown on top line.
 * With this current line, we can:
-  * Use `u` or `d` to move it up or down in the boot order.
-  * Use `t` to relabel the boot entry.
-  * Use `r` to remove it.
+  * Type `u` or `d` to move it up or down in the boot order.
+  * Type `t` to relabel the boot entry.
+  * Type `r` to remove the boot entry.
   * And so forth.
 * The entries with `*` on the left are active boot entries; toggle whether
-  active by pressing `*`.
-* Use the `ESC` key to abandon any changes and reload the boot information.
+  active by typing `*` for the corresponding entries.
+* Press `ESC` key to abandon any changes and reload the boot information.
 * When ready to write the changes to the BIOS, enter `w`.
 * When writing the changes, `efibootdude` drops out of menu mode so you can
   verify the underlying commands, error codes, and error messages.
+* After you write changes, type `b` to reboot, if you wish and the boot menu looks OK.
+* BTW, the top-line keys vary per context; e.g.:
+  * `w` is only shown with pending changes, and
+  * `b` is only shown w/o pending changes.
 
 ## Caveats
 * Some operations may not work permanently even though there is no indication from `efibootmgr`