1
0
Fork 0
mirror of synced 2024-11-22 16:25:34 -05:00

fix clean path expansion to also expand environment variables

This commit is contained in:
Derek P Sifford 2018-08-06 15:12:44 -04:00
parent f95cbe2705
commit af299fbc26

View file

@ -34,11 +34,11 @@ class Clean(dotbot.Plugin):
Cleans all the broken symbolic links in target if they point to Cleans all the broken symbolic links in target if they point to
a subdirectory of the base directory or if forced to clean. a subdirectory of the base directory or if forced to clean.
''' '''
if not os.path.isdir(os.path.expanduser(target)): if not os.path.isdir(os.path.expandvars(os.path.expanduser(target))):
self._log.debug('Ignoring nonexistent directory %s' % target) self._log.debug('Ignoring nonexistent directory %s' % target)
return True return True
for item in os.listdir(os.path.expanduser(target)): for item in os.listdir(os.path.expandvars(os.path.expanduser(target))):
path = os.path.join(os.path.expanduser(target), item) path = os.path.join(os.path.expandvars(os.path.expanduser(target)), item)
if not os.path.exists(path) and os.path.islink(path): if not os.path.exists(path) and os.path.islink(path):
points_at = os.path.join(os.path.dirname(path), os.readlink(path)) points_at = os.path.join(os.path.dirname(path), os.readlink(path))
if self._in_directory(path, self._context.base_directory()) or force: if self._in_directory(path, self._context.base_directory()) or force: