sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tools/scripts/bump-revision.sh: fix regression introduced in r380431

Browse source 
- Fix regression mistakenly introduced in r380431
- Handle multiple tabs in PORTREVISION
- Handle PORTREVISION being a variable name
- Handle multiple PORTREVISION values
- Get rid of bash-like syntax
- Grammar corrections

PR:		192910
Reviewed by:	danfe, mandree, mat
This commit is contained in:
Bartek Rutkowski 2015-03-04 23:21:59 +00:00
parent e3dad0e904
commit ab6c260d33
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=380455
1 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Tools/scripts/bump-revision.sh
View file

@ -25,9 +25,9 @@ printc () {
# $1 - msg is obligatory, $2 - color (red/green)of the message, default if not passed # $1 - msg is obligatory, $2 - color (red/green)of the message, default if not passed
if [ -t 1 ]; then if [ -t 1 ]; then
if [ $# -eq 2 ]; then if [ $# -eq 2 ]; then
if [ $2 == "red" ]; then if [ $2 = "red" ]; then
echo -e "\033[1;31m$1\033[m" echo -e "\033[1;31m$1\033[m"
elif [ $2 == "green" ]; then elif [ $2 = "green" ]; then
echo -e "\033[1;32m$1\033[m" echo -e "\033[1;32m$1\033[m"
else else
echo "$1" echo "$1"
@ -48,40 +48,49 @@ trap "rm -f $tempfile" 0 1 2 3 15
while [ $# -gt 0 ] while [ $# -gt 0 ]
do do
if [ -f "$1/Makefile" ]; then if [ -f "$1/Makefile" ]; then
# If the Makefile exists, continue and empty the tempfile # If the Makefile exists, continue and empty the tempfile, set up variables
echo -n > $tempfile echo -n > $tempfile
revision=`grep "^PORTREVISION?\?=" "$1/Makefile"` revision_str=`grep "^PORTREVISION?\?=" "$1/Makefile"`
if [ $? == 0 ]; then revision_num=`echo "$revision_str" | awk -F "\t+" '{ print $2 }'`
case $? in
0)
# If the exit code is 0, then PORTREVISION line was found # If the exit code is 0, then PORTREVISION line was found
if [ `echo "$revision" | wc -l` == 1 ]; then if [ `echo "$revision_str" | wc -l` = 1 ]; then
# If the $revision variable has only 1 line, then proceed with processing it # If the $revision_str variable has only 1 line, then proceed with processing it
case `echo "$revision" | awk -F "\t+" '{ print $2}'` in case `echo "$revision_str" | awk -F "\t+" '{ print $2 }'` in
(*[^0-9]*|'') (*[^0-9]*|'')
# If the value of PORTREVISION is not an integer, we cant bump its value # If the value of PORTREVISION is not an integer, we can't bump its value
printc "ERROR: $1 PORTREVISION value is not a number, unable to solve!" "red" printc "ERROR: $1 PORTREVISION value is not a number, unable to solve!" "red"
;; ;;
(*) (*)
# If the value of PORTREVISION is an integer, increase it by 1 # If the value of PORTREVISION is an integer, increase it by 1
printc "INFO: $1 $revision found, bumping it by 1." "green" printc "INFO: $1 PORTREVISION= $revision_num found, bumping it by 1." "green"
awk -F "\t+" '/^PORTREVISION\??=/{ gsub ($2,$2+1) };{ print }' "$1/Makefile" > $tempfile \ rm -f $tempfile && awk -F "\t+" '/^PORTREVISION\??=/{ gsub ($2, $2+1) }; { print }' "$1/Makefile" > $tempfile \
&& cat $tempfile > "$1/Makefile" \ && cat $tempfile > "$1/Makefile" \
|| printc "ERROR: $1 PORTREVISION found but failed to bump it!" "red" || printc "ERROR: $1 PORTREVISION found but failed to bump it!" "red"
;; ;;
esac esac
else else
# If the $revision variable had more than 1 line, we cant bump its value reliably # If the $revision_str variable had more than 1 line, we can't bump its value safely
printc "ERROR: $1 PORTREVISION found more than once, unable to solve!" "red" printc "ERROR: $1 PORTREVISION found more than once, unable to bump it reliably!" "red"
fi fi
else ;;
# There was no PORTREVISION line, so we need to add one with value of 1 1)
printc "INFO: $1 PORTREVISION not found, adding PORTREVISION=1" "green" # If the exit code is 1 then PORTREVISION wasn't found, so we need to add one with value of 1
awk '/^(PORT|DIST)VERSION\??=\t/{print;print "PORTREVISION=\t1";next} {print}' "$1/Makefile" > $tempfile \ printc "INFO: $1 PORTREVISION not found, adding PORTREVISION= 1" "green"
rm -f $tempfile && awk '/^(PORT|DIST)VERSION\??=\t/{ print; print "PORTREVISION=\t1"; next } { print }' "$1/Makefile" > $tempfile \
&& cat $tempfile > "$1/Makefile" \ && cat $tempfile > "$1/Makefile" \
|| printc "ERROR: $1 PORTREVISION found but failed to bump it!" "red" || printc "ERROR: $1 PORTREVISION found but failed to bump it!" "red"
fi ;;
*)
printc "ERROR: PORTREVISION grep for $1 exited with error!" "red"
;;
esac
else else
# The directory specified had no Makefile, so it seems like a mistake # The directory specified had no Makefile, so it seems like a mistake
printc "ERROR: $1 might not be a port directory as $1/Makefile is missing!" "red" printc "ERROR: $1 might not be a port directory because $1/Makefile is missing!" "red"
fi fi
shift shift
done done