clan/clan-core
12
4
Fork 17
Code Issues 99 Pull Requests 5 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request 'sops: make symlinks relative' (#102) from Mic92-mic92 into main
All checks were successful
build / test (push) Successful in 20s
Details

Browse Source
This commit is contained in:
clan-bot 2023-08-08 15:25:46 +00:00
commit 43c1b2e2e1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-cli/clan_cli/secrets/groups.py
View File

@ -60,7 +60,7 @@ def add_member(group_folder: Path, source_folder: Path, name: str) -> None:
f"Cannot add user {name}. {user_target} exists but is not a symlink"
)
os.remove(user_target)
user_target.symlink_to(source)
user_target.symlink_to(os.path.relpath(source, user_target.parent))
def remove_member(group_folder: Path, name: str) -> None:

3
pkgs/clan-cli/clan_cli/secrets/secrets.py
View File

@ -123,7 +123,8 @@ def allow_member(group_folder: Path, source_folder: Path, name: str) -> None:
f"Cannot add user {name}. {user_target} exists but is not a symlink"
)
os.remove(user_target)
user_target.symlink_to(source)
user_target.symlink_to(os.path.relpath(source, user_target.parent))
update_keys(group_folder.parent, collect_keys_for_path(group_folder.parent))