FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

contrib: Fix non-portable shell commands in gcc-git-customization.sh [PR102664]

Browse source 
Use printf instead of echo -n. Use Basic Regular Expressions instead of
sed -r. Check for error from ancient Git versions that don't support the
--git-path option for git-rev-parse. Remove -c flag from install
command, as it's ignored by GNU and BSD install, but means something
different for Solaris and AIX.

contrib/ChangeLog:

	PR other/102664
	* gcc-git-customization.sh: Fix non-portable commands.
This commit is contained in:
Jonathan Wakely 2022-03-09 14:53:52 +00:00
parent 3357878ef5
commit d563b0bff1
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
contrib/gcc-git-customization.sh
View file

@ -7,7 +7,7 @@ ask () {
question=$1 question=$1
default=$2 default=$2
var=$3 var=$3
echo -n $question "["$default"]? " printf "%s [%s]? " "$question" "$default"
read answer read answer
if [ "x$answer" = "x" ] if [ "x$answer" = "x" ]
then then
@ -110,7 +110,7 @@ then
# This is a pure guess, but for many people it might be OK. # This is a pure guess, but for many people it might be OK.
remote_id=$(whoami) remote_id=$(whoami)
else else
remote_id=$(echo $url | sed -r "s|^.*ssh://(.+)@gcc.gnu.org.*$|\1|") remote_id=$(echo $url | sed 's|^.*ssh://\(..*\)@gcc.gnu.org.*$|\1|')
if [ x$remote_id = x$url ] if [ x$remote_id = x$url ]
then then
remote_id=$(whoami) remote_id=$(whoami)
@ -118,7 +118,7 @@ then
fi fi
fi fi
ask "Account name on gcc.gnu.org (for your personal branches area)" $remote_id remote_id ask "Account name on gcc.gnu.org (for your personal branches area)" "$remote_id" remote_id
git config "gcc-config.user" "$remote_id" git config "gcc-config.user" "$remote_id"
old_pfx=$(git config --get "gcc-config.userpfx") old_pfx=$(git config --get "gcc-config.userpfx")
@ -135,16 +135,20 @@ git config "gcc-config.userpfx" "$new_pfx"
echo echo
ask "Install prepare-commit-msg git hook for 'git commit-mklog' alias" yes dohook ask "Install prepare-commit-msg git hook for 'git commit-mklog' alias" yes dohook
if [ "x$dohook" = xyes ]; then if [ "x$dohook" = xyes ]; then
hookdir=`git rev-parse --git-path hooks` hookdir=`git rev-parse --git-path hooks 2>/dev/null`
if [ -f "$hookdir/prepare-commit-msg" ]; then if [ $? -eq 0 ]; then
echo " Moving existing prepare-commit-msg hook to prepare-commit-msg.bak" if [ -f "$hookdir/prepare-commit-msg" ]; then
mv "$hookdir/prepare-commit-msg" "$hookdir/prepare-commit-msg.bak" echo " Moving existing prepare-commit-msg hook to prepare-commit-msg.bak"
mv "$hookdir/prepare-commit-msg" "$hookdir/prepare-commit-msg.bak"
fi
install -c "`git rev-parse --show-toplevel`/contrib/prepare-commit-msg" "$hookdir"
else
echo " `git --version` is too old, cannot find hooks dir"
fi fi
install -c "`git rev-parse --show-toplevel`/contrib/prepare-commit-msg" "$hookdir"
fi fi
# Scan the existing settings to see if there are any we need to rewrite. # Scan the existing settings to see if there are any we need to rewrite.
vendors=$(git config --get-all "remote.${upstream}.fetch" "refs/vendors/" | sed -r "s:.*refs/vendors/([^/]+)/.*:\1:" | sort | uniq) vendors=$(git config --get-all "remote.${upstream}.fetch" "refs/vendors/" | sed 's:.*refs/vendors/\([^/][^/]*\)/.*:\1:' | sort | uniq)
url=$(git config --get "remote.${upstream}.url") url=$(git config --get "remote.${upstream}.url")
pushurl=$(git config --get "remote.${upstream}.pushurl") pushurl=$(git config --get "remote.${upstream}.pushurl")
for v in $vendors for v in $vendors