From 9238225556ed25778374fadda2796c9387b65947 Mon Sep 17 00:00:00 2001
From: Luis <consulting@qube.email>
Date: Mon, 23 Oct 2023 02:12:42 +0200
Subject: [PATCH] Fixing merge-after-ci

---
 pkgs/clan-cli/.envrc            | 1 +
 pkgs/merge-after-ci/default.nix | 2 +-
 pkgs/tea-create-pr/script.sh    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/clan-cli/.envrc b/pkgs/clan-cli/.envrc
index 0ded761..c54c07a 100644
--- a/pkgs/clan-cli/.envrc
+++ b/pkgs/clan-cli/.envrc
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # Because we depend on nixpkgs sources, uploading to builders takes a long time
 
 source_up
diff --git a/pkgs/merge-after-ci/default.nix b/pkgs/merge-after-ci/default.nix
index efe5326..1dfc7d4 100644
--- a/pkgs/merge-after-ci/default.nix
+++ b/pkgs/merge-after-ci/default.nix
@@ -21,6 +21,6 @@ writeShellApplication {
     remoteName="''${1:-origin}"
     targetBranch="''${2:-main}"
     shift && shift
-    tea-create-pr "$remoteName" "$targetBranch" --assignees clan-bot "$@"
+    tea-create-pr "$remoteName" "$targetBranch" --assignees consulting-bot "$@"
   '';
 }
diff --git a/pkgs/tea-create-pr/script.sh b/pkgs/tea-create-pr/script.sh
index e85d5ea..7b12498 100644
--- a/pkgs/tea-create-pr/script.sh
+++ b/pkgs/tea-create-pr/script.sh
@@ -6,7 +6,7 @@ targetBranch="${2:-main}"
 shift && shift
 TMPDIR="$(mktemp -d)"
 currentBranch="$(git rev-parse --abbrev-ref HEAD)"
-user="$(tea login list -o simple | cut -d" " -f4)"
+user="$(git config --get user.name)"
 tempRemoteBranch="$user-$currentBranch"
 
 nix fmt -- --fail-on-change