psi-jack/dotbot
1
0
Fork 0
mirror of synced 2024-06-26 02:41:10 -04:00
Code Issues Releases Wiki Activity

Added the ability to use environment variables in link paths, and setup the HOSTNAME environment variable if it isn't already set. This makes linking host specific configs very easy

Browse source
This commit is contained in:
Brian Knobbs 2015-05-06 18:02:31 -04:00
parent eeab507d15
commit dd144a2044
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dotbot/cli.py
View file

@ -1,3 +1,5 @@
import os
import socket
from argparse import ArgumentParser from argparse import ArgumentParser
from .config import ConfigReader, ReadingError from .config import ConfigReader, ReadingError
from .dispatcher import Dispatcher, DispatchError from .dispatcher import Dispatcher, DispatchError
@ -24,6 +26,8 @@ def read_config(config_file):
def main(): def main():
log = Messenger() log = Messenger()
os.environ.setdefault("HOSTNAME", socket.gethostname())
try: try:
parser = ArgumentParser() parser = ArgumentParser()
add_options(parser) add_options(parser)

2
dotbot/executor/linker.py
View file

@ -107,7 +107,7 @@ class Linker(Executor):
Returns true if successfully linked files. Returns true if successfully linked files.
''' '''
success = False success = False
source = os.path.join(self._base_directory, source) source = os.path.expandvars(os.path.join(self._base_directory, source))
if (not self._exists(link_name) and self._is_link(link_name) and if (not self._exists(link_name) and self._is_link(link_name) and
self._link_destination(link_name) != source): self._link_destination(link_name) != source):
self._log.warning('Invalid link %s -> %s' % self._log.warning('Invalid link %s -> %s' %