From 171b36ea3bae86af31e1c626d74ca0450db9eebd Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Wed, 2 Aug 2023 17:25:49 +1000 Subject: [PATCH] Do not mistakenly detect BusyBox sed as GNU sed. --- script/10.1.0 | 2 +- script/10.2.0 | 2 +- script/10.3.0 | 2 +- script/12.1.0 | 2 +- script/12.2.0 | 2 +- script/4.7.3 | 2 +- script/4.8.4 | 2 +- script/4.8.5 | 2 +- script/4.9.2 | 2 +- script/4.9.3 | 2 +- script/4.9.4 | 2 +- script/5.1.0 | 2 +- script/5.2.0 | 2 +- script/5.3.0 | 2 +- script/5.4.0 | 2 +- script/5.5.0 | 2 +- script/6.1.0 | 2 +- script/6.2.0 | 2 +- script/6.3.0 | 2 +- script/6.4.0 | 2 +- script/6.5.0 | 2 +- script/7.1.0 | 2 +- script/7.2.0 | 2 +- script/7.3.0 | 2 +- script/7.5.0 | 2 +- script/8.3.0 | 2 +- script/9.3.0 | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/script/10.1.0 b/script/10.1.0 index 7af5cbf..3dd5396 100755 --- a/script/10.1.0 +++ b/script/10.1.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/10.2.0 b/script/10.2.0 index ad691a8..1bf9951 100755 --- a/script/10.2.0 +++ b/script/10.2.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/10.3.0 b/script/10.3.0 index 67add49..4676d3d 100755 --- a/script/10.3.0 +++ b/script/10.3.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/12.1.0 b/script/12.1.0 index 93dea89..52853b3 100755 --- a/script/12.1.0 +++ b/script/12.1.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/12.2.0 b/script/12.2.0 index f388c98..6f44ef3 100755 --- a/script/12.2.0 +++ b/script/12.2.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/4.7.3 b/script/4.7.3 index 9c5c013..96f2e80 100755 --- a/script/4.7.3 +++ b/script/4.7.3 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/4.8.4 b/script/4.8.4 index c4ec214..12b2616 100755 --- a/script/4.8.4 +++ b/script/4.8.4 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/4.8.5 b/script/4.8.5 index 14052fc..e2041ce 100755 --- a/script/4.8.5 +++ b/script/4.8.5 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/4.9.2 b/script/4.9.2 index 50bf84d..c3a4822 100755 --- a/script/4.9.2 +++ b/script/4.9.2 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/4.9.3 b/script/4.9.3 index a01795e..0533360 100755 --- a/script/4.9.3 +++ b/script/4.9.3 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/4.9.4 b/script/4.9.4 index bf8a563..f5da5c0 100755 --- a/script/4.9.4 +++ b/script/4.9.4 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/5.1.0 b/script/5.1.0 index efc32c5..ee44786 100755 --- a/script/5.1.0 +++ b/script/5.1.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/5.2.0 b/script/5.2.0 index 096b609..b7e50b9 100755 --- a/script/5.2.0 +++ b/script/5.2.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/5.3.0 b/script/5.3.0 index 3c7688a..903bca2 100755 --- a/script/5.3.0 +++ b/script/5.3.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/5.4.0 b/script/5.4.0 index 1e74033..e96813b 100755 --- a/script/5.4.0 +++ b/script/5.4.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/5.5.0 b/script/5.5.0 index fc73b51..b620ab6 100755 --- a/script/5.5.0 +++ b/script/5.5.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/6.1.0 b/script/6.1.0 index eef09f8..da73291 100755 --- a/script/6.1.0 +++ b/script/6.1.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/6.2.0 b/script/6.2.0 index c86670a..7544437 100755 --- a/script/6.2.0 +++ b/script/6.2.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/6.3.0 b/script/6.3.0 index 0385ba8..489263f 100755 --- a/script/6.3.0 +++ b/script/6.3.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/6.4.0 b/script/6.4.0 index 42b4144..c0ca194 100755 --- a/script/6.4.0 +++ b/script/6.4.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/6.5.0 b/script/6.5.0 index 3ee17b9..60b4413 100755 --- a/script/6.5.0 +++ b/script/6.5.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/7.1.0 b/script/7.1.0 index 1104f57..c0dd1aa 100755 --- a/script/7.1.0 +++ b/script/7.1.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/7.2.0 b/script/7.2.0 index 2c6a4d9..7b40d57 100755 --- a/script/7.2.0 +++ b/script/7.2.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/7.3.0 b/script/7.3.0 index c516fbc..6f7d9e2 100755 --- a/script/7.3.0 +++ b/script/7.3.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/7.5.0 b/script/7.5.0 index 49edbf4..c3981e8 100755 --- a/script/7.5.0 +++ b/script/7.5.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/8.3.0 b/script/8.3.0 index 80f4e26..28899e6 100755 --- a/script/8.3.0 +++ b/script/8.3.0 @@ -52,7 +52,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2" diff --git a/script/9.3.0 b/script/9.3.0 index 2500bee..ea4483f 100755 --- a/script/9.3.0 +++ b/script/9.3.0 @@ -53,7 +53,7 @@ done # check GNU sed is installed or not. # It is for OSX, which doesn't ship with GNU sed. -if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null ;then +if ! sed --version 2>/dev/null |grep "GNU sed" > /dev/null || sed --version 2>/dev/null |grep "This is not GNU sed" > /dev/null ;then echo GNU sed is not installed, need to download. SED_VERSION=4.2.2 SED_ARCHIVE="${FTP_GNU_DOWNLOAD_BASE}/sed/sed-${SED_VERSION}.tar.bz2"