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

tea-create-pr: Better username detection

Browse Source
This commit is contained in:
Qubasa
2024-05-30 23:29:59 +02:00
parent adef52a938
commit a8762522c8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tea-create-pr/default.nix
View File

@@ -4,7 +4,6 @@
coreutils, coreutils,
git, git,
tea, tea,
gawk,
openssh, openssh,
}: }:
writeShellApplication { writeShellApplication {
@@ -15,7 +14,6 @@ writeShellApplication {
git git
tea tea
openssh openssh
gawk
]; ];
text = builtins.readFile ./script.sh; text = builtins.readFile ./script.sh;
} }

5
pkgs/tea-create-pr/script.sh
View File

@@ -7,10 +7,12 @@ targetBranch="${3:-main}"
shift && shift shift && shift
TMPDIR="$(mktemp -d)" TMPDIR="$(mktemp -d)"
currentBranch="$(git rev-parse --abbrev-ref HEAD)" currentBranch="$(git rev-parse --abbrev-ref HEAD)"
user="$(git config --get remote.origin.url | awk -F'[@:/]' '{print $3}' | tr -d '\n')" user_unparsed="$(tea whoami)"
user="$(echo "$user_unparsed" | tr -d '\n' | cut -f4 -d' ')"
tempRemoteBranch="$user-$currentBranch" tempRemoteBranch="$user-$currentBranch"
root_dir=$(git rev-parse --show-toplevel) root_dir=$(git rev-parse --show-toplevel)
# Function to check if a remote exists # Function to check if a remote exists
check_remote() { check_remote() {
if git remote get-url "$1" > /dev/null 2>&1; then if git remote get-url "$1" > /dev/null 2>&1; then
@@ -29,6 +31,7 @@ if ! check_remote "$remoteUpstream"; then
fi fi
upstream_url=$(git remote get-url "$remoteUpstream") upstream_url=$(git remote get-url "$remoteUpstream")
git fetch "$remoteUpstream"
repo=$(echo "$upstream_url" | sed -E 's#.*:([^/]+/[^.]+)\.git#\1#') repo=$(echo "$upstream_url" | sed -E 's#.*:([^/]+/[^.]+)\.git#\1#')
treefmt -C "$root_dir" treefmt -C "$root_dir"