Merge branch 'refs/heads/fix-grep'

src/tools/pkg/deb/adm/pwra_env.sh

@@ -19,7 +19,7 @@ pwra_set_func()
     # Command is "set base"
     basename=$2
     basename=${basename//\./\\.}
-    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep "\s"$basename"\s" | grep "^"%base"\s" | awk '{print $3}'`
+    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "\s"$basename"\s" | grep -a "^"%base"\s" | awk '{print $3}'`
     if [ -z $baseroot ]; then
       echo "Unable to find base '$2'"
       return
@@ -66,14 +66,14 @@ pwra_set_func()
     # Command is "set project"
 
     project=$2
-    basename=`eval cat $pwra_db/pwr_projectlist.dat | grep "^"$project"\b" | awk '{print $2}'`
+    basename=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "^"$project"\b" | awk '{print $2}'`
     basename=${basename//\./\\.}
     if [ -z $basename ]; then
       echo "Unable to find project '$2'"
       return
     fi
 
-    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep "\s"$basename"\s" | grep "^"%base"\s" | awk '{print $3}'`
+    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "\s"$basename"\s" | grep -a "^"%base"\s" | awk '{print $3}'`
     if [ -z $baseroot ]; then
       echo "Unable to find base '$2'"
       return

src/tools/pkg/deb_x86_64/adm/pwra_env.sh

@@ -19,7 +19,7 @@ pwra_set_func()
     # Command is "set base"
     basename=$2
     basename=${basename//\./\\.}
-    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep "\s"$basename"\s" | grep "^"%base"\s" | awk '{print $3}'`
+    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "\s"$basename"\s" | grep -a "^"%base"\s" | awk '{print $3}'`
     if [ -z $baseroot ]; then
       echo "Unable to find base '$2'"
       return
@@ -66,14 +66,14 @@ pwra_set_func()
     # Command is "set project"
 
     project=$2
-    basename=`eval cat $pwra_db/pwr_projectlist.dat | grep "^"$project"\b" | awk '{print $2}'`
+    basename=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "^"$project"\b" | awk '{print $2}'`
     basename=${basename//\./\\.}
     if [ -z $basename ]; then
       echo "Unable to find project '$2'"
       return
     fi
 
-    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep "\s"$basename"\s" | grep "^"%base"\s" | awk '{print $3}'`
+    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "\s"$basename"\s" | grep -a "^"%base"\s" | awk '{print $3}'`
     if [ -z $baseroot ]; then
       echo "Unable to find base '$2'"
       return

src/tools/pkg/raspbian/adm/pwra_env.sh

@@ -19,7 +19,7 @@ pwra_set_func()
     # Command is "set base"
     basename=$2
     basename=${basename//\./\\.}
-    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep "\s"$basename"\s" | grep "^"%base"\s" | awk '{print $3}'`
+    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "\s"$basename"\s" | grep -a "^"%base"\s" | awk '{print $3}'`
     if [ -z $baseroot ]; then
       echo "Unable to find base '$2'"
       return
@@ -60,14 +60,14 @@ pwra_set_func()
     # Command is "set project"
 
     project=$2
-    basename=`eval cat $pwra_db/pwr_projectlist.dat | grep "^"$project"\b" | awk '{print $2}'`
+    basename=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "^"$project"\b" | awk '{print $2}'`
     basename=${basename//\./\\.}
     if [ -z $basename ]; then
       echo "Unable to find project '$2'"
       return
     fi
 
-    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep "\s"$basename"\s" | grep "^"%base"\s" | awk '{print $3}'`
+    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "\s"$basename"\s" | grep -a "^"%base"\s" | awk '{print $3}'`
     if [ -z $baseroot ]; then
       echo "Unable to find base '$2'"
       return

src/tools/pkg/ubu/adm/pwra_env.sh

@@ -19,7 +19,7 @@ pwra_set_func()
     # Command is "set base"
     basename=$2
     basename=${basename//\./\\.}
-    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep "\s"$basename"\s" | grep "^"%base"\s" | awk '{print $3}'`
+    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "\s"$basename"\s" | grep -a "^"%base"\s" | awk '{print $3}'`
     if [ -z $baseroot ]; then
       echo "Unable to find base '$2'"
       return
@@ -66,14 +66,14 @@ pwra_set_func()
     # Command is "set project"
 
     project=$2
-    basename=`eval cat $pwra_db/pwr_projectlist.dat | grep "^"$project"\b" | awk '{print $2}'`
+    basename=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "^"$project"\b" | awk '{print $2}'`
     basename=${basename//\./\\.}
     if [ -z $basename ]; then
       echo "Unable to find project '$2'"
       return
     fi
 
-    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep "\s"$basename"\s" | grep "^"%base"\s" | awk '{print $3}'`
+    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "\s"$basename"\s" | grep -a "^"%base"\s" | awk '{print $3}'`
     if [ -z $baseroot ]; then
       echo "Unable to find base '$2'"
       return

src/tools/pkg/ubu_x86_64/adm/pwra_env.sh

@@ -19,7 +19,7 @@ pwra_set_func()
     # Command is "set base"
     basename=$2
     basename=${basename//\./\\.}
-    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep "\s"$basename"\s" | grep "^"%base"\s" | awk '{print $3}'`
+    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "\s"$basename"\s" | grep -a "^"%base"\s" | awk '{print $3}'`
     if [ -z $baseroot ]; then
       echo "Unable to find base '$2'"
       return
@@ -66,14 +66,14 @@ pwra_set_func()
     # Command is "set project"
 
     project=$2
-    basename=`eval cat $pwra_db/pwr_projectlist.dat | grep "^"$project"\b" | awk '{print $2}'`
+    basename=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "^"$project"\b" | awk '{print $2}'`
     basename=${basename//\./\\.}
     if [ -z $basename ]; then
       echo "Unable to find project '$2'"
       return
     fi
 
-    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep "\s"$basename"\s" | grep "^"%base"\s" | awk '{print $3}'`
+    baseroot=`eval cat $pwra_db/pwr_projectlist.dat | grep -a "\s"$basename"\s" | grep -a "^"%base"\s" | awk '{print $3}'`
     if [ -z $baseroot ]; then
       echo "Unable to find base '$2'"
       return