fix: apps cloner

blaggacao · Feb 26, 2024 · 90ae850 · 90ae850
1 parent 46fe1c7
commit 90ae850
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/shell.nix b/src/shell.nix
@@ -178,9 +178,12 @@ in {
  text = let
  clone = app: ''
  if [[ ! -d "$PRJ_ROOT/apps/${app.pname}" ]]; then
- git clone --branch {app.src.src.rev} --origin upstream --branch custom --depth 1 ${app.src.src.gitRepoUrl} "$PRJ_ROOT/apps/${app.pname}"
+ git clone --config "diff.fsjd.command=fsjd --git" --single-branch --branch "${app.src.src.rev}" \
+ --origin upstream --depth 1 "${app.src.src.gitRepoUrl}" \
+ "$PRJ_ROOT/apps/${app.pname}"
  (
  cd "$PRJ_ROOT/apps/${app.pname}";
+ git switch -c custom
  diff -uraN ${app.src} "$PRJ_ROOT/apps/${app.pname}" | patch
  find . -type f -iname "*.orig" -delete
  git add .