This allows calling the function from anywhere in the git tree, without having to calculate the relative route to the script. It also makes more sense for this piece of code to be a function than a script. Minor changes: replace <"> by <'>. Signed-off-by: Alejandro Colomar <alx.manpages@xxxxxxxxx> --- scripts/bash_aliases | 17 ++++++++++++++++- scripts/modified_pages.sh | 34 ---------------------------------- 2 files changed, 16 insertions(+), 35 deletions(-) delete mode 100755 scripts/modified_pages.sh diff --git a/scripts/bash_aliases b/scripts/bash_aliases index c0c8bc33e..127ed5d08 100644 --- a/scripts/bash_aliases +++ b/scripts/bash_aliases @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only ######################################################################## # -# (C) Copyright 2021, Alejandro Colomar +# (C) Copyright 2020, 2021, Alejandro Colomar # These functions are free software; you can redistribute them and/or # modify them under the terms of the GNU General Public License # as published by the Free Software Foundation; version 2. @@ -147,6 +147,21 @@ function pdfman() xdg-open ${tmp}; } +# man_gitstaged prints a list of all files with changes staged for commit +# (basename only if the files are within <man?/>), separated by ", ". +# Usage example: .../man-pages$ git commit -m "$(man_gitstaged): msg"; + +function man_gitstaged() +{ + git status \ + |sed '/Changes not staged for commit:/q' \ + |grep -E '^\s*(modified|deleted|new file):' \ + |sed 's/^.*:\s*/, /' \ + |sed 's%man[1-9]/%%' \ + |tr -d '\n' \ + |sed 's/^, //' +} + ######################################################################## # Glibc diff --git a/scripts/modified_pages.sh b/scripts/modified_pages.sh deleted file mode 100755 index f6c4a6cea..000000000 --- a/scripts/modified_pages.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -## SPDX-License-Identifier: GPL-2.0-only -######################################################################## -## -## (C) Copyright 2020, Alejandro Colomar -## This program is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License -## as published by the Free Software Foundation; version 2. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details -## (http://www.gnu.org/licenses/gpl-2.0.html). -## -######################################################################## -## -## The output of this script is a -## list of all files with changes staged for commit -## (basename only if the files are within "man?/"), -## separated by ", ". -## Usage: -## git commit -m "$(./scripts/modified_pages.sh): Short message here" -## - - -git status \ -|sed "/Changes not staged for commit:/q" \ -|grep -E "^\s*(modified|deleted|new file):" \ -|sed "s/^.*:\s*/, /" \ -|sed "s%man[1-9]/%%" \ -|tr -d '\n' \ -|sed "s/^, //" -- 2.30.1.721.g45526154a5