From: Mike B. <mi...@ze...> - 2010-12-19 20:37:04
|
Currently we use some really ugly shell scripting to grab the svn revision of our packages. I propose that we change this to what I have been using with the darkness theme for some time: current: (svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n' changed: svnversion -n "${SVN_REPO_PATH:-.}"|grep -Eo "^[0-9]+" Comments welcome. -- Mike Blumenkrantz Zentific: We run the three-legged race individually. |
From: Mike B. <mi...@ze...> - 2010-12-19 21:18:33
|
On Sun, 19 Dec 2010 15:36:57 -0500 Mike Blumenkrantz <mi...@ze...> wrote: > Currently we use some really ugly shell scripting to grab the svn revision of > our packages. I propose that we change this to what I have been using with > the darkness theme for some time: > > current: > (svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : > '{printf("%s\n", $1);}' | tr -d ' :MSP\n' > > changed: > svnversion -n "${SVN_REPO_PATH:-.}"|grep -Eo "^[0-9]+" > > Comments welcome. > Also the git version can be changed as well: current: git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n' changed: git log -n1 --pretty=format:%b 2> /dev/null | grep -Eo "@[0-9]+" | tr -d '@' Much nicer. -- Mike Blumenkrantz Zentific: We run the three-legged race individually. |
From: Albin T. <alb...@gm...> - 2010-12-19 21:32:19
|
On Sun, 19 Dec 2010 16:18 -0500, Mike Blumenkrantz wrote : > On Sun, 19 Dec 2010 15:36:57 -0500 > Mike Blumenkrantz <mi...@ze...> wrote: > > > Currently we use some really ugly shell scripting to grab the svn revision of > > our packages. I propose that we change this to what I have been using with > > the darkness theme for some time: > > > > current: > > (svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : > > '{printf("%s\n", $1);}' | tr -d ' :MSP\n' > > > > changed: > > svnversion -n "${SVN_REPO_PATH:-.}"|grep -Eo "^[0-9]+" > > > > Comments welcome. > > > Also the git version can be changed as well: > current: > git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e > 's/.*@\([0-9]*\).*/\1/' | tr -d '\n' > > changed: > git log -n1 --pretty=format:%b 2> /dev/null | grep -Eo "@[0-9]+" | tr -d '@' I like the idea, but I think the git version is going to fail if the (actual) commit message contains @<numbers>, which isn't all that unlikely. Cheers, -- Albin Tonnerre |
From: Christopher M. <cpm...@co...> - 2010-12-20 04:14:14
|
That's git's problem, yea ? dh On 12/19/2010 04:32 PM, Albin Tonnerre wrote: > On Sun, 19 Dec 2010 16:18 -0500, Mike Blumenkrantz wrote : >> On Sun, 19 Dec 2010 15:36:57 -0500 >> Mike Blumenkrantz<mi...@ze...> wrote: >> >>> Currently we use some really ugly shell scripting to grab the svn revision of >>> our packages. I propose that we change this to what I have been using with >>> the darkness theme for some time: >>> >>> current: >>> (svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : >>> '{printf("%s\n", $1);}' | tr -d ' :MSP\n' >>> >>> changed: >>> svnversion -n "${SVN_REPO_PATH:-.}"|grep -Eo "^[0-9]+" >>> >>> Comments welcome. >>> >> Also the git version can be changed as well: >> current: >> git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e >> 's/.*@\([0-9]*\).*/\1/' | tr -d '\n' >> >> changed: >> git log -n1 --pretty=format:%b 2> /dev/null | grep -Eo "@[0-9]+" | tr -d '@' > > I like the idea, but I think the git version is going to fail if the (actual) > commit message contains @<numbers>, which isn't all that unlikely. > > Cheers, -- "If C gives you enough rope to hang yourself, then C++ gives you enough rope to bind and gag your neighborhood, rig the sails on a small ship, and still have enough rope to hang yourself from the yardarm" - Anonymous quote from the The UNIX-HATERS Handbook |
From: Joerg S. <jo...@br...> - 2010-12-19 21:56:11
|
On Sun, Dec 19, 2010 at 03:36:57PM -0500, Mike Blumenkrantz wrote: > changed: > svnversion -n "${SVN_REPO_PATH:-.}"|grep -Eo "^[0-9]+" "grep -o" is not portable. Can't you do: svnversion -n "${SVN_REPO_PATH:-.}"| sed 's,^\([0-9]*\).*$,\1,' for much the same result? Joerg |
From: Michael J. <me...@ka...> - 2010-12-19 22:39:57
|
On Sunday, 19 December 2010, at 22:30:18 (+0100), Joerg Sonnenberger wrote: > "grep -o" is not portable. Can't you do: > > svnversion -n "${SVN_REPO_PATH:-.}"| sed 's,^\([0-9]*\).*$,\1,' The spec files use: svnversion | sed 's/[^0-9].*$//' || echo 0000 which is portable. Michael -- Michael Jennings (a.k.a. KainX) http://www.kainx.org/ <me...@ka...> Linux Server/Cluster Admin, LBL.gov Author, Eterm (www.eterm.org) ----------------------------------------------------------------------- "Unix is like a Vorlon: It is incredibly powerful, gives terse, cryptic answers, and has a lot of things going on in the background." -- Jeff Dubrule |
From: Joerg S. <jo...@br...> - 2010-12-19 22:47:52
|
On Sun, Dec 19, 2010 at 02:20:21PM -0800, Michael Jennings wrote: > On Sunday, 19 December 2010, at 22:30:18 (+0100), > Joerg Sonnenberger wrote: > > > "grep -o" is not portable. Can't you do: > > > > svnversion -n "${SVN_REPO_PATH:-.}"| sed 's,^\([0-9]*\).*$,\1,' > > The spec files use: > > svnversion | sed 's/[^0-9].*$//' || echo 0000 > > which is portable. One important differences is that it picks up M if you have any local changes. Joerg |
From: Michael J. <me...@ka...> - 2010-12-19 23:19:38
|
On Sunday, 19 December 2010, at 23:47:43 (+0100), Joerg Sonnenberger wrote: > > The spec files use: > > > > svnversion | sed 's/[^0-9].*$//' || echo 0000 > > > > which is portable. > > One important differences is that it picks up M if you have any local > changes. Check again. :) Michael -- Michael Jennings (a.k.a. KainX) http://www.kainx.org/ <me...@ka...> Linux Server/Cluster Admin, LBL.gov Author, Eterm (www.eterm.org) ----------------------------------------------------------------------- "No one knows the shape of that future or where it will take us. We know only that it is always born in pain." -- G'Kar, Babylon 5 |
From: Christopher M. <cpm...@co...> - 2010-12-20 04:12:51
|
On 12/19/2010 03:36 PM, Mike Blumenkrantz wrote: > Currently we use some really ugly shell scripting to grab the svn revision of > our packages. I propose that we change this to what I have been using with the > darkness theme for some time: > > current: > (svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : > '{printf("%s\n", $1);}' | tr -d ' :MSP\n' > > changed: > svnversion -n "${SVN_REPO_PATH:-.}"|grep -Eo "^[0-9]+" > > Comments welcome. > I Second !! dh -- "If C gives you enough rope to hang yourself, then C++ gives you enough rope to bind and gag your neighborhood, rig the sails on a small ship, and still have enough rope to hang yourself from the yardarm" - Anonymous quote from the The UNIX-HATERS Handbook |
From: Mike B. <mi...@ze...> - 2010-12-20 21:30:39
|
On Sun, 19 Dec 2010 15:19:31 -0800 Michael Jennings <me...@ka...> wrote: > On Sunday, 19 December 2010, at 23:47:43 (+0100), > Joerg Sonnenberger wrote: > > > > The spec files use: > > > > > > svnversion | sed 's/[^0-9].*$//' || echo 0000 > > > > > > which is portable. > > > > One important differences is that it picks up M if you have any local > > changes. > > Check again. :) > > Michael > Unless I get some negative replies, I'm going to go through and make this change across trunk/ -- Mike Blumenkrantz Zentific: We run the three-legged race individually. |
From: Carsten H. (T. R. <ra...@ra...> - 2010-12-20 23:37:19
|
On Mon, 20 Dec 2010 16:30:33 -0500 Mike Blumenkrantz <mi...@ze...> said: > On Sun, 19 Dec 2010 15:19:31 -0800 > Michael Jennings <me...@ka...> wrote: > > > On Sunday, 19 December 2010, at 23:47:43 (+0100), > > Joerg Sonnenberger wrote: > > > > > > The spec files use: > > > > > > > > svnversion | sed 's/[^0-9].*$//' || echo 0000 > > > > > > > > which is portable. > > > > > > One important differences is that it picks up M if you have any local > > > changes. > > > > Check again. :) > > > > Michael > > > Unless I get some negative replies, I'm going to go through and make this > change across trunk/ i'd say no - why change what works just to make the shell script shorter by a bit? michael already made a point - you will get the M. by changing this you: 1. risk breaking things where grep isn't a full gnu grep 2. change the numbers to include things that were filtered out before for what gain? some "shell script purity"? no. i say no. it works. it's been tested widely by now. don't break it. there is no gain in changing it. -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) ra...@ra... |
From: Michael J. <me...@ka...> - 2010-12-20 23:52:59
|
On Tuesday, 21 December 2010, at 08:37:01 (+0900), Carsten Haitzler wrote: > i'd say no - why change what works just to make the shell script shorter by a > bit? michael already made a point - you will get the M. by changing this you: > > 1. risk breaking things where grep isn't a full gnu grep > 2. change the numbers to include things that were filtered out before > > for what gain? some "shell script purity"? no. i say no. it works. it's been > tested widely by now. don't break it. there is no gain in changing it. No, the version I supplied does NOT contain the 'M' and has been extensively tested across multiple projects including the spec files in our own SVN tree. Joerg was the one who erroneously claimed that the 'M' would remain, but he was wrong. All it includes is the first number output by "svnversion." I'm not pushing for or against; just supplying information. Michael -- Michael Jennings (a.k.a. KainX) http://www.kainx.org/ <me...@ka...> Linux Server/Cluster Admin, LBL.gov Author, Eterm (www.eterm.org) ----------------------------------------------------------------------- "You know the real reason God kicked Adam & Eve Consulting Associates LLC off the Eden project, dontcha? Adam & Eve wanted to audit everything and redo Creation in java." -- Ari Heitner on BugTraq |
From: Mike B. <mi...@ze...> - 2010-12-21 05:13:42
|
On Mon, 20 Dec 2010 15:52:52 -0800 Michael Jennings <me...@ka...> wrote: > On Tuesday, 21 December 2010, at 08:37:01 (+0900), > Carsten Haitzler wrote: > > > i'd say no - why change what works just to make the shell script shorter by > > a bit? michael already made a point - you will get the M. by changing this > > you: > > > > 1. risk breaking things where grep isn't a full gnu grep > > 2. change the numbers to include things that were filtered out before > > > > for what gain? some "shell script purity"? no. i say no. it works. it's been > > tested widely by now. don't break it. there is no gain in changing it. It should be changed because using grep + awk + printf + tr when we could use a single sed is stupid and makes us look stupid. > > No, the version I supplied does NOT contain the 'M' and has been > extensively tested across multiple projects including the spec files > in our own SVN tree. Joerg was the one who erroneously claimed that > the 'M' would remain, but he was wrong. All it includes is the first > number output by "svnversion." > > I'm not pushing for or against; just supplying information. > > Michael > As the above states, that sed line is both portable, tested, and functional, and makes a fine replacement. -- Mike Blumenkrantz Zentific: We run the three-legged race individually. |
From: Carsten H. (T. R. <ra...@ra...> - 2010-12-21 09:02:26
|
On Tue, 21 Dec 2010 00:13:34 -0500 Mike Blumenkrantz <mi...@ze...> said: > On Mon, 20 Dec 2010 15:52:52 -0800 > Michael Jennings <me...@ka...> wrote: > > > On Tuesday, 21 December 2010, at 08:37:01 (+0900), > > Carsten Haitzler wrote: > > > > > i'd say no - why change what works just to make the shell script shorter > > > by a bit? michael already made a point - you will get the M. by changing > > > this you: > > > > > > 1. risk breaking things where grep isn't a full gnu grep > > > 2. change the numbers to include things that were filtered out before > > > > > > for what gain? some "shell script purity"? no. i say no. it works. it's > > > been tested widely by now. don't break it. there is no gain in changing > > > it. > It should be changed because using grep + awk + printf + tr when we could use > a single sed is stupid and makes us look stupid. > > > > No, the version I supplied does NOT contain the 'M' and has been > > extensively tested across multiple projects including the spec files > > in our own SVN tree. Joerg was the one who erroneously claimed that > > the 'M' would remain, but he was wrong. All it includes is the first > > number output by "svnversion." > > > > I'm not pushing for or against; just supplying information. > > > > Michael > > > As the above states, that sed line is both portable, tested, and functional, > and makes a fine replacement. change it after 1.0 is out. -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) ra...@ra... |