mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-30 19:21:17 +00:00
Code Issues Releases Wiki Activity

add missing BORG_REMOTE_PATH env var, fixes #1258

Browse source
This commit is contained in:
Thomas Waldmann 2016-07-04 15:06:20 +02:00
parent 458edf351b
commit 3325126988
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
borg/archiver.py
View file

@ -912,8 +912,8 @@ def build_parser(self, args=None, prog=None):
help='do not load/update the file metadata cache used to detect unchanged files')
common_parser.add_argument('--umask', dest='umask', type=lambda s: int(s, 8), default=UMASK_DEFAULT, metavar='M',
help='set umask to M (local and remote, default: %(default)04o)')
common_parser.add_argument('--remote-path', dest='remote_path', default='borg', metavar='PATH',
help='set remote path to executable (default: "%(default)s")')
common_parser.add_argument('--remote-path', dest='remote_path', metavar='PATH',
help='set remote path to executable (default: "borg")')
parser = argparse.ArgumentParser(prog=prog, description='Borg - Deduplicated Backups')
parser.add_argument('-V', '--version', action='version', version='%(prog)s ' + __version__,

3
borg/remote.py
View file

@ -220,7 +220,8 @@ def borg_cmd(self, args, testing):
if testing:
return [sys.executable, '-m', 'borg.archiver', 'serve'] + opts + self.extra_test_args
else: # pragma: no cover
return [args.remote_path, 'serve'] + opts
remote_path = args.remote_path or os.environ.get('BORG_REMOTE_PATH', 'borg')
return [remote_path, 'serve'] + opts
def ssh_cmd(self, location):
"""return a ssh command line that can be prefixed to a borg command line"""

3
docs/usage.rst
View file

@ -82,6 +82,9 @@ General:
BORG_RSH
When set, use this command instead of ``ssh``. This can be used to specify ssh options, such as
a custom identity file ``ssh -i /path/to/private/key``. See ``man ssh`` for other options.
BORG_REMOTE_PATH
When set, use the given path/filename as remote path (default is "borg").
Using ``--remote-path PATH`` commandline option overrides the environment variable.
TMPDIR
where temporary files are stored (might need a lot of temporary space for some operations)