On 15:38 Fri 11 Oct 2019, Randy Dunlap wrote:
Hi Bhaskar, 1- the Subject line is incomplete, missing some info: e.g. [PATCH] scripts: setlocalversion: fix shell syntax
Oops! let me redo it, I was going by your earlier suggestion :)
On 10/11/19 12:05 AM, Bhaskar Chowdhury wrote: 2- at this place, there should be a description of how the patch "fixes" the shell syntax. and why.
My bad, was kinda confused,thought it might break the patch..lack of awareness. Will fix that next one.
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@xxxxxxxxx> --- scripts/setlocalversion | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 220dae0db3f1..b82a29bfc78a 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -45,11 +45,11 @@ scm_version() # Check for git and a git repo. if test -z "$(git rev-parse --show-cdup 2>/dev/null)" && - head=`git rev-parse --verify --short HEAD 2>/dev/null`; then + head=$(git rev-parse --verify --short HEAD 2>/dev/null); then3- That indentation change is not good IMO.
Heck...another fix ...I am gobbling up your and others precious time with this trivialities. Will be careful .
4- The patch does seem to work, in my limited testing.
I made sure before sending anything , that thing should work in my local environment. Thank you for the double check ...at least I am inline :)
5- Near the beginning of the script, it seems to say that the author would like to be Cc:ed on patches.
Curse me for ignoring that...not fun ..why the fuck I missed that I don't know...
# If we are at a tagged commit (like "v2.6.30-rc6"), we ignore # it, because this version is defined in the top level Makefile. - if [ -z "`git describe --exact-match 2>/dev/null`" ]; then + if [ -z "$(git describe --exact-match 2>/dev/null)" ]; then # If only the short version is requested, don't bother # running further git commands @@ -59,7 +59,7 @@ scm_version() fi # If we are past a tagged commit (like # "v2.6.30-rc5-302-g72357d5"), we pretty print it. - if atag="`git describe 2>/dev/null`"; then + if atag="$(git describe 2>/dev/null)"; then echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}' # If we don't have a tag at all we print -g{commitish}. @@ -70,7 +70,7 @@ scm_version() # Is this git on svn? if git config --get svn-remote.svn.url >/dev/null; then - printf -- '-svn%s' "`git svn find-rev $head`" + printf -- '-svn%s' "$(git svn find-rev $head)" fi # Check for uncommitted changes. @@ -91,15 +91,15 @@ scm_version() fi # Check for mercurial and a mercurial repo. - if test -d .hg && hgid=`hg id 2>/dev/null`; then + if test -d .hg && hgid=$(hg id 2>/dev/null); then # Do we have an tagged version? If so, latesttagdistance == 1 - if [ "`hg log -r . --template '{latesttagdistance}'`" == "1" ]; then - id=`hg log -r . --template '{latesttag}'` + if [ "$(hg log -r . --template '{latesttagdistance}')" == "1" ]; then + id=$(hg log -r . --template '{latesttag}') printf '%s%s' -hg "$id" else - tag=`printf '%s' "$hgid" | cut -d' ' -f2` + tag=$(printf '%s' "$hgid" | cut -d' ' -f2) if [ -z "$tag" -o "$tag" = tip ]; then - id=`printf '%s' "$hgid" | sed 's/[+ ].*//'` + id=$(printf '%s' "$hgid" | sed 's/[+ ].*//') printf '%s%s' -hg "$id" fi fi @@ -115,8 +115,8 @@ scm_version() fi # Check for svn and a svn repo. - if rev=`LANG= LC_ALL= LC_MESSAGES=C svn info 2>/dev/null | grep '^Last Changed Rev'`; then - rev=`echo $rev | awk '{print $NF}'` + if rev=$(LANG= LC_ALL= LC_MESSAGES=C svn info 2>/dev/null | grep '^Last Changed Rev'); then + rev=$(echo $rev | awk '{print $NF}') printf -- '-svn%s' "$rev" # All done with svn
Thank you so much for your invaluable time Randy...will be sending another one with the correction. Thanks, Bhaskar
Thanks. -- ~Randy
Attachment:
signature.asc
Description: PGP signature
