Skip to content

P
proview
Commit 31e09f38 authored by Marcus Nordenberg's avatar Marcus Nordenberg
Browse files
Options

Fix pwra_env.sh not able to parse pwr_projectlist.dat correct 

Due to grep suddendly parsing pwr_projectlist.dat as a binary file the
flag -a was added to all grep commands for all distributions but
freebsd.
parent 61bed774
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 35 deletions
src/tools/pkg/deb/adm/pwra_env.sh
View file @ 31e09f38
...@@ -19,7 +19,7 @@ pwra_set_func() ...@@ -19,7 +19,7 @@ pwra_set_func()
# Command is "set base" # Command is "set base"
basename=$2 basename=$2
basename=${basename//\./\\.} 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 if [ -z $baseroot ]; then
echo "Unable to find base '$2'" echo "Unable to find base '$2'"
return return
...@@ -66,14 +66,14 @@ pwra_set_func() ...@@ -66,14 +66,14 @@ pwra_set_func()
# Command is "set project" # Command is "set project"
project=$2 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//\./\\.} basename=${basename//\./\\.}
if [ -z $basename ]; then if [ -z $basename ]; then
echo "Unable to find project '$2'" echo "Unable to find project '$2'"
return return
fi 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 if [ -z $baseroot ]; then
echo "Unable to find base '$2'" echo "Unable to find base '$2'"
return return
......
src/tools/pkg/deb_x86_64/adm/pwra_env.sh
View file @ 31e09f38
...@@ -19,7 +19,7 @@ pwra_set_func() ...@@ -19,7 +19,7 @@ pwra_set_func()
# Command is "set base" # Command is "set base"
basename=$2 basename=$2
basename=${basename//\./\\.} 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 if [ -z $baseroot ]; then
echo "Unable to find base '$2'" echo "Unable to find base '$2'"
return return
...@@ -66,14 +66,14 @@ pwra_set_func() ...@@ -66,14 +66,14 @@ pwra_set_func()
# Command is "set project" # Command is "set project"
project=$2 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//\./\\.} basename=${basename//\./\\.}
if [ -z $basename ]; then if [ -z $basename ]; then
echo "Unable to find project '$2'" echo "Unable to find project '$2'"
return return
fi 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 if [ -z $baseroot ]; then
echo "Unable to find base '$2'" echo "Unable to find base '$2'"
return return
......
src/tools/pkg/raspbian/adm/pwra_env.sh
View file @ 31e09f38
...@@ -19,7 +19,7 @@ pwra_set_func() ...@@ -19,7 +19,7 @@ pwra_set_func()
# Command is "set base" # Command is "set base"
basename=$2 basename=$2
basename=${basename//\./\\.} 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 if [ -z $baseroot ]; then
echo "Unable to find base '$2'" echo "Unable to find base '$2'"
return return
...@@ -60,14 +60,14 @@ pwra_set_func() ...@@ -60,14 +60,14 @@ pwra_set_func()
# Command is "set project" # Command is "set project"
project=$2 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//\./\\.} basename=${basename//\./\\.}
if [ -z $basename ]; then if [ -z $basename ]; then
echo "Unable to find project '$2'" echo "Unable to find project '$2'"
return return
fi 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 if [ -z $baseroot ]; then
echo "Unable to find base '$2'" echo "Unable to find base '$2'"
return return
......
src/tools/pkg/ubu/adm/pwra_env.sh
View file @ 31e09f38
...@@ -19,7 +19,7 @@ pwra_set_func() ...@@ -19,7 +19,7 @@ pwra_set_func()
# Command is "set base" # Command is "set base"
basename=$2 basename=$2
basename=${basename//\./\\.} 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 if [ -z $baseroot ]; then
echo "Unable to find base '$2'" echo "Unable to find base '$2'"
return return
...@@ -66,14 +66,14 @@ pwra_set_func() ...@@ -66,14 +66,14 @@ pwra_set_func()
# Command is "set project" # Command is "set project"
project=$2 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//\./\\.} basename=${basename//\./\\.}
if [ -z $basename ]; then if [ -z $basename ]; then
echo "Unable to find project '$2'" echo "Unable to find project '$2'"
return return
fi 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 if [ -z $baseroot ]; then
echo "Unable to find base '$2'" echo "Unable to find base '$2'"
return return
......
src/tools/pkg/ubu_x86_64/adm/pwra_env.sh
View file @ 31e09f38
...@@ -19,7 +19,7 @@ pwra_set_func() ...@@ -19,7 +19,7 @@ pwra_set_func()
# Command is "set base" # Command is "set base"
basename=$2 basename=$2
basename=${basename//\./\\.} 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 if [ -z $baseroot ]; then
echo "Unable to find base '$2'" echo "Unable to find base '$2'"
return return
...@@ -66,14 +66,14 @@ pwra_set_func() ...@@ -66,14 +66,14 @@ pwra_set_func()
# Command is "set project" # Command is "set project"
project=$2 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//\./\\.} basename=${basename//\./\\.}
if [ -z $basename ]; then if [ -z $basename ]; then
echo "Unable to find project '$2'" echo "Unable to find project '$2'"
return return
fi 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 if [ -z $baseroot ]; then
echo "Unable to find base '$2'" echo "Unable to find base '$2'"
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7