From 4c3dfc4c521bb543f59fd273ecabe2c474fd2ba0 Mon Sep 17 00:00:00 2001 From: druckdev Date: Sat, 22 Jan 2022 00:02:36 +0100 Subject: [PATCH] meta:git-remote: Don't hardcode `origin` as remote As I know how the url should look like I can allow the default remote being named differently. --- meta/git-remote | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/git-remote b/meta/git-remote index 377d879..4112904 100755 --- a/meta/git-remote +++ b/meta/git-remote @@ -5,12 +5,13 @@ die() { exit ${2:-1} } -remote="$(git remote get-url origin)" -! printf "$remote" | grep -q '^git@' || die "Using ssh already.\n" 0 +remote="$(git remote -v | grep -m1 "druckdev/dotfiles" | cut -f1)" +url="$(git remote get-url "$remote")" +! printf "$url" | grep -q '^git@' || die "Using ssh already.\n" 0 -host="$(printf "$remote" | cut -d/ -f3)" +host="$(printf "$url" | cut -d/ -f3)" grep -q "$host" "$HOME"/.ssh/known_hosts || die "No ssh key for $host found.\n" -ssh_remote="$(printf "$remote" | sed 's_^https\?://_git@_;s_/_:_')" -git remote set-url origin "$ssh_remote" -die "Set origin remote url to $ssh_remote\n" $? +ssh_url="$(printf "$url" | sed 's_^https\?://_git@_;s_/_:_')" +git remote set-url "$remote" "$ssh_url" +die "Set $remote remote url to $ssh_url\n" $?