Skip to content

Commit

Permalink
Nits
Browse files Browse the repository at this point in the history
  • Loading branch information
Ken Kundert authored and Ken Kundert committed Sep 30, 2019
1 parent 7670493 commit 76adf61
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
7 changes: 4 additions & 3 deletions emborg/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
hostname = gethostname()
from inform import (
Color, Error,
codicil, conjoin, full_stop, is_str, narrate, os_error, output, render, warn
codicil, conjoin, cull, full_stop, is_str, narrate, os_error, output,
render, warn
)
from docopt import docopt
from shlib import mkdir, rm, to_path, Run, set_prefs
Expand Down Expand Up @@ -255,7 +256,7 @@ def run(cls, command, args, settings, options):
cmds = settings.value('run_before_backup')
if is_str(cmds):
cmds = [cmds]
for cmd in cmds:
for cmd in cull(cmds):
narrate('running pre-backup script:', cmd)
try:
Run(cmd, 'SoEW')
Expand Down Expand Up @@ -286,7 +287,7 @@ def run(cls, command, args, settings, options):
cmds = settings.value('run_after_backup')
if is_str(cmds):
cmds = [cmds]
for cmd in cmds:
for cmd in cull(cmds):
narrate('running post-backup script:', cmd)
try:
Run(cmd, 'SoEW')
Expand Down
12 changes: 6 additions & 6 deletions emborg/preferences.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,18 @@
borg_executable = 'path to borg',
check_after_create = 'run check as the last step of an archive creation',
config_name = 'name of active configuration (set by program)',
configurations = 'available emborg configurations',
default_configuration = 'default emborg configuration',
encryption = 'encryption method (see borg documentation)',
configurations = 'available Emborg configurations',
default_configuration = 'default Emborg configuration',
encryption = 'encryption method (see Borg documentation)',
excludes = 'list of glob strings of files or directories to skip',
exclude_from = 'file that contains exclude patterns',
must_exist = 'if set, each of these files or directorys must exist or create will quit with an error',
needs_ssh_agent = 'if set, emborg will complain if ssh_agent is not available',
must_exist = 'if set, each of these files or directories must exist or create will quit with an error',
needs_ssh_agent = 'if set, Emborg will complain if ssh_agent is not available',
notifier = 'notification program',
notify = 'email address to notify when things go wrong',
passcommand = 'command used by Borg to acquire the passphrase',
passphrase = 'passphrase for encryption key (if specified, Avendesora is not used)',
prune_after_create = 'run prune as the last step of an archive creation',
prune_after_create = 'run prune after creating an archive',
repository = 'path to remote directory that contains repository',
run_after_backup = 'command to run after archive has been created',
run_before_backup = 'command to run before archive is to be created',
Expand Down

0 comments on commit 76adf61

Please sign in to comment.