remove -printf option from find; remove the misplaced 'local's

This commit is contained in:
Wolfgang Bumiller 2013-09-25 11:16:15 +02:00
parent 87fcf8d8e8
commit 904c45060b

View file

@ -69,7 +69,7 @@ fi
if [ ! -d ~/.gmqcc/testsuite/projects ]; then if [ ! -d ~/.gmqcc/testsuite/projects ]; then
mkdir -p ~/.gmqcc/testsuite/projects mkdir -p ~/.gmqcc/testsuite/projects
local old="$PWD" old="$PWD"
cd ~/.gmqcc/testsuite/projects cd ~/.gmqcc/testsuite/projects
echo "$(ls ../ | cat | grep -v '^hashes$' | grep -v '^projects$' | grep -v '^options$')" | while read -r line echo "$(ls ../ | cat | grep -v '^hashes$' | grep -v '^projects$' | grep -v '^options$')" | while read -r line
do do
@ -101,8 +101,9 @@ env -i type gmqcc 1>/dev/null 2>&1 || {
end_dir="$PWD" end_dir="$PWD"
cd ~/.gmqcc/testsuite/projects cd ~/.gmqcc/testsuite/projects
start="$PWD" start="$PWD"
find . -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | while read -r line find . -maxdepth 1 -mindepth 1 -type d | while read -r line
do do
line="${line#./}"
echo -n "compiling $line... " echo -n "compiling $line... "
cd "${start}/${line}" cd "${start}/${line}"
@ -113,7 +114,7 @@ do
do do
# change to subproject # change to subproject
echo -n " compiling $dir... " echo -n " compiling $dir... "
local old="$PWD" old="$PWD"
cd "$dir" cd "$dir"
"$gmqcc_bin" $(cat ../../../options | grep "$line:" | awk '{print substr($0, index($0, $2))}') > /dev/null 2>&1 "$gmqcc_bin" $(cat ../../../options | grep "$line:" | awk '{print substr($0, index($0, $2))}') > /dev/null 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then