[openoffice] branch AOO41X updated: fgrep is deprecated and may be removed soon, use grep -F instead (#173)

[ms...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO41X by this push:
     new 55221da57b fgrep is deprecated and may be removed soon, use grep -F instead (#173)
55221da57b is described below

commit 55221da57b24f5a0360a1ce0c1cd73debd003a45
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Mon Mar 20 17:51:57 2023 +0100

    fgrep is deprecated and may be removed soon, use grep -F instead (#173)
    
    * Update makedepn
    
    * Minor change to commentregarding fgrep
    (cherry picked from commit 710881b9d2e5e6dd5049799bb07d3a7624286aa0)
---
 main/solenv/bin/makedepn              |  2 +-
 main/unotools/source/misc/fontcvt.cxx | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/solenv/bin/makedepn b/main/solenv/bin/makedepn
index bd73e3458f..a68d4998be 100755
--- a/main/solenv/bin/makedepn
+++ b/main/solenv/bin/makedepn
@@ -24,7 +24,7 @@ if [ -z "$1" ]; then
 fi
 infile=`echo "$1" | sed 's/^@//'`
 for i in `cat "$infile"`; do
-  i=`echo "$i" | fgrep -- "-O:" | awk -F: '{print $2}'`
+  i=`echo "$i" | grep -F -- "-O:" | awk -F: '{print $2}'`
   if [ ! -z "$i" ]; then
     echo "#" > "$i"
     exit 0;
diff --git a/main/unotools/source/misc/fontcvt.cxx b/main/unotools/source/misc/fontcvt.cxx
index 0d852e3ae8..e8df045c49 100644
--- a/main/unotools/source/misc/fontcvt.cxx
+++ b/main/unotools/source/misc/fontcvt.cxx
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -1398,7 +1398,7 @@ struct RecodeTable { const char* pOrgName; ConvertChar aCvt;};
 static RecodeTable aRecodeTable[] =
 {
     // the first two entries must be StarMath and StarBats; do not reorder!
-    // reason: fgrep for FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS
+    // reason: grep -F for FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS
     {"starbats",        {aStarBatsTab,  "StarSymbol", NULL}},
     {"starmath",        {aStarMathTab,  "StarSymbol", NULL}},