mirror of
https://github.com/deadc0de6/dotdrop.git
synced 2026-02-12 04:49:00 +00:00
fix include/import bug for #112
This commit is contained in:
@@ -365,14 +365,7 @@ class Cfg:
|
|||||||
continue
|
continue
|
||||||
self.prodots[k].append(self.dotfiles[d])
|
self.prodots[k].append(self.dotfiles[d])
|
||||||
|
|
||||||
# handle "include" for each profile
|
# handle "import" (from file) for each profile
|
||||||
for k in self.lnk_profiles.keys():
|
|
||||||
ret, dots = self._get_included_dotfiles(k)
|
|
||||||
if not ret:
|
|
||||||
return False
|
|
||||||
self.prodots[k].extend(dots)
|
|
||||||
|
|
||||||
# handle "import" for each profile
|
|
||||||
for k in self.lnk_profiles.keys():
|
for k in self.lnk_profiles.keys():
|
||||||
dots = self._get_imported_dotfiles_keys(k)
|
dots = self._get_imported_dotfiles_keys(k)
|
||||||
for d in dots:
|
for d in dots:
|
||||||
@@ -382,6 +375,13 @@ class Cfg:
|
|||||||
continue
|
continue
|
||||||
self.prodots[k].append(self.dotfiles[d])
|
self.prodots[k].append(self.dotfiles[d])
|
||||||
|
|
||||||
|
# handle "include" (from other profile) for each profile
|
||||||
|
for k in self.lnk_profiles.keys():
|
||||||
|
ret, dots = self._get_included_dotfiles(k)
|
||||||
|
if not ret:
|
||||||
|
return False
|
||||||
|
self.prodots[k].extend(dots)
|
||||||
|
|
||||||
# remove duplicates if any
|
# remove duplicates if any
|
||||||
for k in self.lnk_profiles.keys():
|
for k in self.lnk_profiles.keys():
|
||||||
self.prodots[k] = list(set(self.prodots[k]))
|
self.prodots[k] = list(set(self.prodots[k]))
|
||||||
|
|||||||
Reference in New Issue
Block a user