* [PATCH] BaseTools:Linux changes the way the latest version is judged
@ 2019-06-21 2:33 Fan, ZhijuX
2019-06-24 3:17 ` Liming Gao
2019-06-24 3:25 ` [edk2-devel] " rebecca
0 siblings, 2 replies; 9+ messages in thread
From: Fan, ZhijuX @ 2019-06-21 2:33 UTC (permalink / raw)
To: devel@edk2.groups.io; +Cc: Gao, Liming, Feng, Bob C
[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]
BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1929
Some Linux servers do not have BC installed,so errors occur.
So the judgment was changed to avoid this error.
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
---
edksetup.sh | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/edksetup.sh b/edksetup.sh
index c7b2e1e201..0723e7b85a 100755
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -122,8 +122,7 @@ function SetupPython3()
export PYTHON_COMMAND=$python
continue
fi
- ret=`echo "$origin_version < $python_version" |bc`
- if [ "$ret" -eq 1 ]; then
+ if [ "$origin_version" \< "$python_version" ]; then
origin_version=$python_version
export PYTHON_COMMAND=$python
fi
@@ -165,8 +164,7 @@ function SetupPython()
export PYTHON_COMMAND=$python
continue
fi
- ret=`echo "$origin_version < $python_version" |bc`
- if [ "$ret" -eq 1 ]; then
+ if [ "$origin_version" \< "$python_version" ]; then
origin_version=$python_version
export PYTHON_COMMAND=$python
fi
--
2.14.1.windows.1
[-- Attachment #2: winmail.dat --]
[-- Type: application/ms-tnef, Size: 3745 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] BaseTools:Linux changes the way the latest version is judged
2019-06-21 2:33 [PATCH] BaseTools:Linux changes the way the latest version is judged Fan, ZhijuX
@ 2019-06-24 3:17 ` Liming Gao
2019-06-24 3:25 ` [edk2-devel] " rebecca
1 sibling, 0 replies; 9+ messages in thread
From: Liming Gao @ 2019-06-24 3:17 UTC (permalink / raw)
To: Fan, ZhijuX, devel@edk2.groups.io; +Cc: Feng, Bob C
Zhiju:
The change is good. What test have you done?
Thanks
Liming
> -----Original Message-----
> From: Fan, ZhijuX
> Sent: Friday, June 21, 2019 10:33 AM
> To: devel@edk2.groups.io
> Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
> Subject: [PATCH] BaseTools:Linux changes the way the latest version is judged
>
> BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1929
>
> Some Linux servers do not have BC installed,so errors occur.
> So the judgment was changed to avoid this error.
>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
> ---
> edksetup.sh | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/edksetup.sh b/edksetup.sh
> index c7b2e1e201..0723e7b85a 100755
> --- a/edksetup.sh
> +++ b/edksetup.sh
> @@ -122,8 +122,7 @@ function SetupPython3()
> export PYTHON_COMMAND=$python
> continue
> fi
> - ret=`echo "$origin_version < $python_version" |bc`
> - if [ "$ret" -eq 1 ]; then
> + if [ "$origin_version" \< "$python_version" ]; then
> origin_version=$python_version
> export PYTHON_COMMAND=$python
> fi
> @@ -165,8 +164,7 @@ function SetupPython()
> export PYTHON_COMMAND=$python
> continue
> fi
> - ret=`echo "$origin_version < $python_version" |bc`
> - if [ "$ret" -eq 1 ]; then
> + if [ "$origin_version" \< "$python_version" ]; then
> origin_version=$python_version
> export PYTHON_COMMAND=$python
> fi
> --
> 2.14.1.windows.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [edk2-devel] [PATCH] BaseTools:Linux changes the way the latest version is judged
2019-06-21 2:33 [PATCH] BaseTools:Linux changes the way the latest version is judged Fan, ZhijuX
2019-06-24 3:17 ` Liming Gao
@ 2019-06-24 3:25 ` rebecca
2019-06-25 2:18 ` FW: " Fan, ZhijuX
1 sibling, 1 reply; 9+ messages in thread
From: rebecca @ 2019-06-24 3:25 UTC (permalink / raw)
To: devel, zhijux.fan; +Cc: Gao, Liming, Feng, Bob C
On 2019-06-20 20:33, Fan, ZhijuX wrote:
> - ret=`echo "$origin_version < $python_version" |bc`
> - if [ "$ret" -eq 1 ]; then
> + if [ "$origin_version" \< "$python_version" ]; then
> origin_version=$python_version
> export PYTHON_COMMAND=$python
> fi
I think using the "-lt" operator might be better (more standard). e.g.:
if [ "$origin_version" -lt "$python_version" ]; then
--
Rebecca Cran
^ permalink raw reply [flat|nested] 9+ messages in thread
* FW: [edk2-devel] [PATCH] BaseTools:Linux changes the way the latest version is judged
2019-06-24 3:25 ` [edk2-devel] " rebecca
@ 2019-06-25 2:18 ` Fan, ZhijuX
2019-06-25 2:33 ` rebecca
0 siblings, 1 reply; 9+ messages in thread
From: Fan, ZhijuX @ 2019-06-25 2:18 UTC (permalink / raw)
To: rebecca@bluestop.org, devel@edk2.groups.io; +Cc: Gao, Liming, Feng, Bob C
Using "-lt" will report the following errors, but "\<" will not
3.6: integer expression expected
3.7: integer expression expected
if [[ "$origin_version" < "$python_version" ]];then
It is equivalent to
if [ "$origin_version" \< "$python_version" ];then
These two approaches work
Any question, please let me know. Thanks.
Best Regards
Fan Zhiju
-----Original Message-----
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of rebecca@bluestop.org
Sent: Monday, June 24, 2019 11:25 AM
To: devel@edk2.groups.io; Fan, ZhijuX <zhijux.fan@intel.com>
Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
Subject: Re: [edk2-devel] [PATCH] BaseTools:Linux changes the way the latest version is judged
On 2019-06-20 20:33, Fan, ZhijuX wrote:
> - ret=`echo "$origin_version < $python_version" |bc`
> - if [ "$ret" -eq 1 ]; then
> + if [ "$origin_version" \< "$python_version" ]; then
> origin_version=$python_version
> export PYTHON_COMMAND=$python
> fi
I think using the "-lt" operator might be better (more standard). e.g.:
if [ "$origin_version" -lt "$python_version" ]; then
--
Rebecca Cran
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: FW: [edk2-devel] [PATCH] BaseTools:Linux changes the way the latest version is judged
2019-06-25 2:18 ` FW: " Fan, ZhijuX
@ 2019-06-25 2:33 ` rebecca
2019-06-26 4:46 ` Fan, ZhijuX
0 siblings, 1 reply; 9+ messages in thread
From: rebecca @ 2019-06-25 2:33 UTC (permalink / raw)
To: devel, zhijux.fan; +Cc: Gao, Liming, Feng, Bob C
[-- Attachment #1: Type: text/plain, Size: 948 bytes --]
On 2019-06-24 20:18, Fan, ZhijuX wrote:
> Using "-lt" will report the following errors, but "\<" will not
> 3.6: integer expression expected
> 3.7: integer expression expected
>
> if [[ "$origin_version" < "$python_version" ]];then
> It is equivalent to
> if [ "$origin_version" \< "$python_version" ];then
> These two approaches work
>
> Any question, please let me know. Thanks.
You might want to extract the major and minor values and compare them
separately then. The "<" operator in bash does a string comparison,
which I'm not sure is what's wanted here?
>From http://tldp.org/LDP/abs/html/comparison-ops.html :
<
is less than, in ASCII
<http://tldp.org/LDP/abs/html/special-chars.html#ASCIIDEF>
alphabetical order
*if [[ "$a" < "$b" ]]*
*if [ "$a" \< "$b" ]*
Note that the "<" needs to be escaped
<http://tldp.org/LDP/abs/html/escapingsection.html#ESCP> within a *[
]* construct.
--
Rebecca Cran
[-- Attachment #2: Type: text/html, Size: 1873 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: FW: [edk2-devel] [PATCH] BaseTools:Linux changes the way the latest version is judged
2019-06-25 2:33 ` rebecca
@ 2019-06-26 4:46 ` Fan, ZhijuX
2019-06-26 15:47 ` rebecca
0 siblings, 1 reply; 9+ messages in thread
From: Fan, ZhijuX @ 2019-06-26 4:46 UTC (permalink / raw)
To: devel@edk2.groups.io, rebecca@bluestop.org; +Cc: Gao, Liming, Feng, Bob C
[-- Attachment #1: Type: text/plain, Size: 1662 bytes --]
Hi:
Python3.6 and python3.7
After the code removes some common values “python”, we compare “3.6” and “3.7”
origin_version = “3.6”, python_version=”3.7”
I'm going to change it to
if [[ "$origin_version" < "$python_version" ]]; then
Any question, please let me know. Thanks.
Best Regards
Fan Zhiju
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of rebecca@bluestop.org
Sent: Tuesday, June 25, 2019 10:34 AM
To: devel@edk2.groups.io; Fan, ZhijuX <zhijux.fan@intel.com>
Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
Subject: Re: FW: [edk2-devel] [PATCH] BaseTools:Linux changes the way the latest version is judged
On 2019-06-24 20:18, Fan, ZhijuX wrote:
Using "-lt" will report the following errors, but "\<" will not
3.6: integer expression expected
3.7: integer expression expected
if [[ "$origin_version" < "$python_version" ]];then
It is equivalent to
if [ "$origin_version" \< "$python_version" ];then
These two approaches work
Any question, please let me know. Thanks.
You might want to extract the major and minor values and compare them separately then. The "<" operator in bash does a string comparison, which I'm not sure is what's wanted here?
From http://tldp.org/LDP/abs/html/comparison-ops.html :
<
is less than, in ASCII<http://tldp.org/LDP/abs/html/special-chars.html#ASCIIDEF> alphabetical order
if [[ "$a" < "$b" ]]
if [ "$a" \< "$b" ]
Note that the "<" needs to be escaped<http://tldp.org/LDP/abs/html/escapingsection.html#ESCP> within a [ ] construct.
--
Rebecca Cran
[-- Attachment #2: Type: text/html, Size: 8945 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: FW: [edk2-devel] [PATCH] BaseTools:Linux changes the way the latest version is judged
2019-06-26 4:46 ` Fan, ZhijuX
@ 2019-06-26 15:47 ` rebecca
0 siblings, 0 replies; 9+ messages in thread
From: rebecca @ 2019-06-26 15:47 UTC (permalink / raw)
To: devel, zhijux.fan; +Cc: Gao, Liming, Feng, Bob C
[-- Attachment #1: Type: text/plain, Size: 637 bytes --]
On 2019-06-25 22:46, Fan, ZhijuX wrote:
>
>
>
> Hi:
>
> Python3.6 and python3.7
>
> After the code removes some common values “python”, we compare “3.6”
> and “3.7”
>
> origin_version = “3.6”, python_version=”3.7”
>
>
>
> I'm going to change it to
>
> if [[ "$origin_version" < "$python_version" ]]; then
>
That's fine for now, hopefully it'll keep working as long as it needs to.
But once you're comparing for example 3.7 and 3.12:
[bcran@photon ~]$ if [[ "3.7" > "3.12" ]]; then echo "wrong!"; else echo
"correct!"; fi
wrong!
--
Rebecca Cran
[-- Attachment #2: Type: text/html, Size: 4765 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [edk2-devel] [PATCH] BaseTools:Linux changes the way the latest version is judged
@ 2019-06-28 7:48 Fan, ZhijuX
2019-07-01 3:59 ` Liming Gao
0 siblings, 1 reply; 9+ messages in thread
From: Fan, ZhijuX @ 2019-06-28 7:48 UTC (permalink / raw)
To: devel@edk2.groups.io, rebecca@bluestop.org; +Cc: Gao, Liming, Feng, Bob C
[-- Attachment #1: Type: text/plain, Size: 1462 bytes --]
Hi:
You're right, but at least we won't have to worry about this until “python3.10”
· And we're comparing directory names, "Python 3.6.6" doesn't appear in the Python version we found
· We find python applications using “whereis python” “/usr/bin/python3.6” “/usr/local/bin/python3.6”
· Later we can compare the form of string length to add a layer of judgment, but we don't need it now.
Any question, please let me know. Thanks.
Best Regards
Fan Zhiju
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of rebecca@bluestop.org
Sent: Wednesday, June 26, 2019 11:48 PM
To: devel@edk2.groups.io; Fan, ZhijuX <zhijux.fan@intel.com>
Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
Subject: Re: FW: [edk2-devel] [PATCH] BaseTools:Linux changes the way the latest version is judged
On 2019-06-25 22:46, Fan, ZhijuX wrote:
Hi:
Python3.6 and python3.7
After the code removes some common values “python”, we compare “3.6” and “3.7”
origin_version = “3.6”, python_version=”3.7”
I'm going to change it to
if [[ "$origin_version" < "$python_version" ]]; then
That's fine for now, hopefully it'll keep working as long as it needs to.
But once you're comparing for example 3.7 and 3.12:
[bcran@photon ~]$ if [[ "3.7" > "3.12" ]]; then echo "wrong!"; else echo "correct!"; fi
wrong!
--
Rebecca Cran
[-- Attachment #2: Type: text/html, Size: 14340 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [edk2-devel] [PATCH] BaseTools:Linux changes the way the latest version is judged
2019-06-28 7:48 Fan, ZhijuX
@ 2019-07-01 3:59 ` Liming Gao
0 siblings, 0 replies; 9+ messages in thread
From: Liming Gao @ 2019-07-01 3:59 UTC (permalink / raw)
To: Fan, ZhijuX, devel@edk2.groups.io, rebecca@bluestop.org; +Cc: Feng, Bob C
[-- Attachment #1: Type: text/plain, Size: 1963 bytes --]
Push@39744883933eea9674ccaf243cbf565966b8fa74
From: Fan, ZhijuX
Sent: Friday, June 28, 2019 3:49 PM
To: devel@edk2.groups.io; rebecca@bluestop.org
Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
Subject: RE: [edk2-devel] [PATCH] BaseTools:Linux changes the way the latest version is judged
Hi:
You're right, but at least we won't have to worry about this until “python3.10”
· And we're comparing directory names, "Python 3.6.6" doesn't appear in the Python version we found
· We find python applications using “whereis python” “/usr/bin/python3.6” “/usr/local/bin/python3.6”
· Later we can compare the form of string length to add a layer of judgment, but we don't need it now.
Any question, please let me know. Thanks.
Best Regards
Fan Zhiju
From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> [mailto:devel@edk2.groups.io] On Behalf Of rebecca@bluestop.org<mailto:rebecca@bluestop.org>
Sent: Wednesday, June 26, 2019 11:48 PM
To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; Fan, ZhijuX <zhijux.fan@intel.com<mailto:zhijux.fan@intel.com>>
Cc: Gao, Liming <liming.gao@intel.com<mailto:liming.gao@intel.com>>; Feng, Bob C <bob.c.feng@intel.com<mailto:bob.c.feng@intel.com>>
Subject: Re: FW: [edk2-devel] [PATCH] BaseTools:Linux changes the way the latest version is judged
On 2019-06-25 22:46, Fan, ZhijuX wrote:
Hi:
Python3.6 and python3.7
After the code removes some common values “python”, we compare “3.6” and “3.7”
origin_version = “3.6”, python_version=”3.7”
I'm going to change it to
if [[ "$origin_version" < "$python_version" ]]; then
That's fine for now, hopefully it'll keep working as long as it needs to.
But once you're comparing for example 3.7 and 3.12:
[bcran@photon ~]$ if [[ "3.7" > "3.12" ]]; then echo "wrong!"; else echo "correct!"; fi
wrong!
--
Rebecca Cran
[-- Attachment #2: Type: text/html, Size: 15841 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-07-01 3:59 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-21 2:33 [PATCH] BaseTools:Linux changes the way the latest version is judged Fan, ZhijuX
2019-06-24 3:17 ` Liming Gao
2019-06-24 3:25 ` [edk2-devel] " rebecca
2019-06-25 2:18 ` FW: " Fan, ZhijuX
2019-06-25 2:33 ` rebecca
2019-06-26 4:46 ` Fan, ZhijuX
2019-06-26 15:47 ` rebecca
-- strict thread matches above, loose matches on Subject: below --
2019-06-28 7:48 Fan, ZhijuX
2019-07-01 3:59 ` Liming Gao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox