Don't hardcode exit values, use os.sync() in ddusb

config/ddusb-exclude.conf

@@ -1,4 +1,3 @@
 # File for excluding block devices from being written to
-# Write one device per line, shell-style globs are accepted i.e. /dev/sda*
-# Brace expansion is not supported
+# One rule per line, regular expressions are accepted i.e. /dev/sda[0-9]?
 # Lines beginning with "#" and ";" are ignored

ddusb.py

@@ -2,7 +2,7 @@
 """Wrapper script for using dd to write to a USB drive."""
 
 import argparse
-import glob
+import os
 import pathlib
 import re
 import subprocess
@@ -11,6 +11,10 @@ import subprocess
 COMMENT_PATTERN = "^[#;]"
 EXCLUDE_FILE = "/etc/helper-scripts/ddusb-exclude.conf"
 
+E_BLOCKDEVICE_ERROR = 1
+E_EXCLUDE_ERROR = 2
+E_DD_ERROR = 3
+
 
 # ========== Functions ==========
 def read_exclude_file(exclude_file):
@@ -33,23 +37,6 @@ def read_exclude_file(exclude_file):
     return lines
 
 
-def expand_globs(*globs):
-    """For each glob given, expand these globs and return a list
-    containing each glob expanded.
-
-    :param globs: patterns to expand
-    :type globs: str
-    :returns: all expanded globs aggregated together
-    :rtype: list
-    """
-    expanded_globs = []
-
-    for line in globs:
-        expanded_globs.extend(glob.glob(line, recursive=True))
-
-    return expanded_globs
-
-
 # ========== Main Script ==========
 parser = argparse.ArgumentParser()
 parser.add_argument("-b", "--bs", default=512, help="block size", metavar="bs")
@@ -59,23 +46,23 @@ args = parser.parse_args()
 
 block_size = args.bs
 input_file = args.input_file
-block_device = args.output_file
+block_path = args.output_file
 
-# Ensure that block_device is really a block device
-if not pathlib.Path(block_device).is_block_device():
-    print(f'Error: "{block_device}" is not a block device')
-    exit(1)
+# Ensure that block_path is really a block device
+if not pathlib.Path(block_path).is_block_device():
+    print(f'Error: "{block_path}" is not a block device')
+    exit(E_BLOCKDEVICE_ERROR)
 
-# Check if block_device is excluded
+# Check if block_path is excluded
 exclude_patterns = read_exclude_file(EXCLUDE_FILE)
-device_blacklist = expand_globs(*exclude_patterns)
 
-if block_device in device_blacklist:
-    print(f'Error: "{block_device}" is blacklisted from running dd')
-    exit(2)
+for pattern in exclude_patterns:
+    if re.fullmatch(pattern, block_path):
+        print(f'Error: "{block_path}" is blacklisted from running dd')
+        exit(E_EXCLUDE_ERROR)
 
 print(f"Input file: {input_file}")
-print(f"Block device: {block_device}")
+print(f"Block device: {block_path}")
 print(f"Block size: {block_size}")
 
 try:
@@ -83,13 +70,13 @@ try:
         [
             "dd",
             f"if={input_file}",
-            f"of={block_device}",
+            f"of={block_path}",
             f"bs={block_size}",
             "status=progress",
         ],
         check=True,
     )
 except subprocess.CalledProcessError:
-    exit(3)
+    exit(E_DD_ERROR)
 else:
-    subprocess.run("sync")
+    os.sync()

zsh/completions/_ddusb

@@ -1,7 +1,6 @@
 #compdef ddusb
 
 # zsh completions for 'ddusb'
-# automatically generated with http://github.com/RobSis/zsh-completion-generator
 local arguments
 
 arguments=(

zsh/completions/_fedit

@@ -2,12 +2,11 @@
 local arguments
 
 arguments=(
-$argument_list
-  {-h, --help}'[show this help message and exit]'
-  {-b, --boot}'[edit a file in /boot]'
-  {-d, --dir}'[edit a file in a given directory]'
-  {-E, --etc}'[edit a file in /etc]'
-  {-e, --editor}'[use a given editor]'
+  {-h,--help}'[show this help message and exit]'
+  {-b,--boot}'[edit a file in /boot]'
+  {-d,--dir}'[edit a file in a given directory]'
+  {-E,--etc}'[edit a file in /etc]'
+  {-e,--editor}'[use a given editor]'
   '*:filename:_files'
 )