yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "clan-cli: deprecate nix_shell() in favor of run_cmd()"

Browse Source 
This reverts commit a598b878a5.
This commit is contained in:
Jörg Thalheim
2024-07-17 14:04:49 +02:00
parent 0518f875cd
commit 64956a7a0a
24 changed files with 116 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/clan-cli/clan_cli/clan/create.py
View File

@@ -10,7 +10,7 @@ from clan_cli.inventory import Inventory, InventoryMeta
from ..cmd import CmdOut, run
from ..errors import ClanError
from ..nix import nix_command, run_cmd
from ..nix import nix_command, nix_shell
default_template_url: str = "git+https://git.clan.lol/clan/clan-core"
minimal_template_url: str = "git+https://git.clan.lol/clan/clan-core#templates.minimal"
@@ -64,19 +64,21 @@ def create_clan(options: CreateOptions) -> CreateClanResponse:
out = run(command, cwd=directory)
## Begin: setup git
command = run_cmd(["git"], ["git", "init"])
command = nix_shell(["nixpkgs#git"], ["git", "init"])
out = run(command, cwd=directory)
cmd_responses["git init"] = out
command = run_cmd(["git"], ["git", "add", "."])
command = nix_shell(["nixpkgs#git"], ["git", "add", "."])
out = run(command, cwd=directory)
cmd_responses["git add"] = out
command = run_cmd(["git"], ["git", "config", "user.name", "clan-tool"])
command = nix_shell(["nixpkgs#git"], ["git", "config", "user.name", "clan-tool"])
out = run(command, cwd=directory)
cmd_responses["git config"] = out
command = run_cmd(["git"], ["git", "config", "user.email", "clan@example.com"])
command = nix_shell(
["nixpkgs#git"], ["git", "config", "user.email", "clan@example.com"]
)
out = run(command, cwd=directory)
cmd_responses["git config"] = out
## End: setup git