1 Commits

Author SHA1 Message Date
10206dd51e Update zsh completions 2019-03-13 21:35:19 -07:00
2 changed files with 9 additions and 14 deletions

View File

@ -2,7 +2,6 @@
"""Wrapper script for using dd to write to a USB drive.""" """Wrapper script for using dd to write to a USB drive."""
import argparse import argparse
import os
import pathlib import pathlib
import re import re
import subprocess import subprocess
@ -11,10 +10,6 @@ import subprocess
COMMENT_PATTERN = "^[#;]" COMMENT_PATTERN = "^[#;]"
EXCLUDE_FILE = "/etc/helper-scripts/ddusb-exclude.conf" EXCLUDE_FILE = "/etc/helper-scripts/ddusb-exclude.conf"
E_BLOCKDEVICE_ERROR = 1
E_EXCLUDE_ERROR = 2
E_DD_ERROR = 3
# ========== Functions ========== # ========== Functions ==========
def read_exclude_file(exclude_file): def read_exclude_file(exclude_file):
@ -51,7 +46,7 @@ block_path = args.output_file
# Ensure that block_path is really a block device # Ensure that block_path is really a block device
if not pathlib.Path(block_path).is_block_device(): if not pathlib.Path(block_path).is_block_device():
print(f'Error: "{block_path}" is not a block device') print(f'Error: "{block_path}" is not a block device')
exit(E_BLOCKDEVICE_ERROR) exit(1)
# Check if block_path is excluded # Check if block_path is excluded
exclude_patterns = read_exclude_file(EXCLUDE_FILE) exclude_patterns = read_exclude_file(EXCLUDE_FILE)
@ -59,7 +54,7 @@ exclude_patterns = read_exclude_file(EXCLUDE_FILE)
for pattern in exclude_patterns: for pattern in exclude_patterns:
if re.fullmatch(pattern, block_path): if re.fullmatch(pattern, block_path):
print(f'Error: "{block_path}" is blacklisted from running dd') print(f'Error: "{block_path}" is blacklisted from running dd')
exit(E_EXCLUDE_ERROR) exit(2)
print(f"Input file: {input_file}") print(f"Input file: {input_file}")
print(f"Block device: {block_path}") print(f"Block device: {block_path}")
@ -77,6 +72,6 @@ try:
check=True, check=True,
) )
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
exit(E_DD_ERROR) exit(3)
else: else:
os.sync() subprocess.run("sync")

View File

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