Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etersoft-build-utils
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
korinf
etersoft-build-utils
Commits
1ca09e66
Commit
1ca09e66
authored
Feb 21, 2010
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
introduce strip_spaces, filter_strip_spaces and use it
parent
7ef2344f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
build
share/eterbuild/functions/build
+1
-2
common
share/eterbuild/functions/common
+13
-3
No files found.
share/eterbuild/functions/build
View file @
1ca09e66
...
...
@@ -170,8 +170,7 @@ do
fi
done
# remove extra space before list
LISTBUILT
=
$(
echo
"
$LISTBUILT
"
|
sed
-e
"s|^ ||"
)
LISTBUILT
=
$(
strip_spaces
"
$LISTBUILT
"
)
test
-z
"
$LISTBUILT
"
&&
fatal
"Error: List for build is empty. Check if file is exist."
#LISTRPMARGS=`echo ${LISTRPMARGS} | sed -e "s/--nodeps//g"`
}
...
...
share/eterbuild/functions/common
View file @
1ca09e66
...
...
@@ -107,6 +107,16 @@ if [ -n "$NEEDETERBUILD" ] ; then
fi
fi
filter_strip_spaces
()
{
sed
-e
"s|^ ||"
|
sed
-e
"s|
\$
||"
}
strip_spaces
()
{
echo
$@
| filter_strip_spaces
}
# drop listed options
# FIXME: do not handle args like -Uh, only -U -h separately
drop_args
()
...
...
@@ -171,12 +181,12 @@ do
# echo is workaround for missed readlink
LISTNAMES
=
"
$LISTNAMES
$(
readlink
-f
"
$i
"
2>/dev/null
||
realpath
"
$i
"
||
echo
"
$i
"
)
"
else
# set target type if -M?? in param
set_target_type
${
i
/-/
}
||
LISTARGS
=
"
$LISTARGS
$i
"
fi
done
# remove extra space before list
LISTNAMES
=
$(
echo
"
$LISTNAMES
"
|
sed
-e
"s|^ ||"
)
LISTARGS
=
$(
echo
"
$LISTARGS
"
|
sed
-e
"s|^ ||"
)
LISTNAMES
=
$(
strip_spaces
"
$LISTNAMES
"
)
LISTARGS
=
$(
strip_spaces
"
$LISTARGS
"
)
# parse MENV
detect_target_env
[
-n
"
$VERBOSE
"
]
&&
echo
"LISTNAMES=
$LISTNAMES
LISTARGS=
$LISTARGS
"
||
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment