diff options
| author | Rene Engelhard <rene@debian.org> | 2022-09-07 21:34:42 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-09-08 14:43:53 +0200 |
| commit | fd42cea5f301a10cdeaa29959f04b111de534132 (patch) | |
| tree | 0bfa9e9f22d63dcbb6eeafc6002752d9ff20399e /odk/config | |
| parent | 09e499e64ec4acb24c9524c8aacabc6182124442 (diff) | |
replace egrep/fgrep calls with grep -E/grep -F
as egrep/fgrep is deprecated since long amd grep 3.8+ now actually warns
(e.g. "egrep: warning: egrep is obsolescent; using grep -E")
Change-Id: I5b10f05dffdd09081deb05cef974e3cdb2907315
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139614
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'odk/config')
| -rwxr-xr-x | odk/config/configure.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/odk/config/configure.pl b/odk/config/configure.pl index f3d0e08b3440..756db5a3c76b 100755 --- a/odk/config/configure.pl +++ b/odk/config/configure.pl @@ -242,7 +242,7 @@ while ( (!$main::correctVersion) && } else { #check version - my $testVersion = `$OO_SDK_ZIP_HOME/zip -h 2>&1 | egrep Zip | head -n 1`; + my $testVersion = `$OO_SDK_ZIP_HOME/zip -h 2>&1 | grep -E Zip | head -n 1`; $testVersion =~ s#Zip ([\d.]+) .*#$1#go; if ( $testVersion eq "") { @@ -414,7 +414,7 @@ while ( (!$main::correctVersion) && } else { #check version - my $testVersion = `$main::OO_SDK_JAVA_HOME/bin/java -version 2>&1 | egrep "java version" | head -n 1 | sed -e 's#.*version "##' | sed -e 's#".*##'`; + my $testVersion = `$main::OO_SDK_JAVA_HOME/bin/java -version 2>&1 | grep -E "java version" | head -n 1 | sed -e 's#.*version "##' | sed -e 's#".*##'`; $testVersion =~ s#([^\n]+)\n#$1#go; $main::correctVersion = testVersion($main::javaVersion, $testVersion, "$main::OO_SDK_JAVA_HOME/bin/java", 1); |