From 82ab27f3633d4d20b16278799c6f0e4649a4c18c Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sat, 25 May 2024 18:29:35 +0200 Subject: fix(pkgs/git-cm): Ensure that the command is correctly named --- pkgs/by-name/gi/git-cm/git-cm.sh | 18 ++++++++++++++++++ pkgs/by-name/gi/git-cm/git-commit.sh | 18 ------------------ pkgs/by-name/gi/git-cm/package.nix | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) create mode 100755 pkgs/by-name/gi/git-cm/git-cm.sh delete mode 100755 pkgs/by-name/gi/git-cm/git-commit.sh (limited to 'pkgs/by-name/gi') diff --git a/pkgs/by-name/gi/git-cm/git-cm.sh b/pkgs/by-name/gi/git-cm/git-cm.sh new file mode 100755 index 00000000..2204e4d6 --- /dev/null +++ b/pkgs/by-name/gi/git-cm/git-cm.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env dash + +# shellcheck source=/dev/null +SHELL_LIBRARY_VERSION="2.1.2" . %SHELL_LIBRARY_PATH + +ROOT="$(git rev-parse --show-toplevel)" + +# Take first line from previous commit +if [ -f "$ROOT/.git/COMMIT_EDITMSG" ]; then + sed '1s/\(.*\)\((.*)\)\?\(:.*\)/\1\2: /;1p;d' "$ROOT/.git/COMMIT_EDITMSG" >"$ROOT/.git/COMMIT_TEMPLATE" +else + printf "\n" >"$ROOT/.git/COMMIT_TEMPLATE" +fi +sed '1d' "$(git config commit.template)" >>"$ROOT/.git/COMMIT_TEMPLATE" + +git commit --template "$ROOT/.git/COMMIT_TEMPLATE" --verbose "$@" + +# vim: ft=sh diff --git a/pkgs/by-name/gi/git-cm/git-commit.sh b/pkgs/by-name/gi/git-cm/git-commit.sh deleted file mode 100755 index 2204e4d6..00000000 --- a/pkgs/by-name/gi/git-cm/git-commit.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env dash - -# shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.1.2" . %SHELL_LIBRARY_PATH - -ROOT="$(git rev-parse --show-toplevel)" - -# Take first line from previous commit -if [ -f "$ROOT/.git/COMMIT_EDITMSG" ]; then - sed '1s/\(.*\)\((.*)\)\?\(:.*\)/\1\2: /;1p;d' "$ROOT/.git/COMMIT_EDITMSG" >"$ROOT/.git/COMMIT_TEMPLATE" -else - printf "\n" >"$ROOT/.git/COMMIT_TEMPLATE" -fi -sed '1d' "$(git config commit.template)" >>"$ROOT/.git/COMMIT_TEMPLATE" - -git commit --template "$ROOT/.git/COMMIT_TEMPLATE" --verbose "$@" - -# vim: ft=sh diff --git a/pkgs/by-name/gi/git-cm/package.nix b/pkgs/by-name/gi/git-cm/package.nix index 96f58b09..a9949783 100644 --- a/pkgs/by-name/gi/git-cm/package.nix +++ b/pkgs/by-name/gi/git-cm/package.nix @@ -4,8 +4,8 @@ gnused, }: sysLib.writeShellScript { - name = "git-commit"; - src = ./git-commit.sh; + name = "git-cm"; + src = ./git-cm.sh; keepPath = true; dependencies = [ git -- cgit 1.4.1