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
5ad23519
Commit
5ad23519
authored
Aug 19, 2015
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
initial support for colorify with csed
parent
e1a0702c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
myhsh
bin/myhsh
+1
-1
rpmbb
bin/rpmbb
+1
-1
common
share/eterbuild/functions/common
+7
-3
No files found.
bin/myhsh
View file @
5ad23519
...
...
@@ -103,7 +103,7 @@ do
# Note: hasher is already use renice for low priority
showcmd
$HSH
$HASHERARG
--build-args
"
$BUILDARGS
"
--
$HASHERDIR
$i
(
$HSH
$HASHERARG
--build-args
"
$BUILDARGS
"
--
$HASHERDIR
$i
2>&1
||
touch
$LOGFILE
.failed
)
|
tee
-a
$LOGFILE
(
$HSH
$HASHERARG
--build-args
"
$BUILDARGS
"
--
$HASHERDIR
$i
2>&1
||
touch
$LOGFILE
.failed
)
|
tee
-a
$LOGFILE
| colorify
test
-L
$HASHERDIR
/BUILD
||
ln
-s
chroot
/usr/src/RPM/BUILD
$HASHERDIR
/
if
[
-f
$LOGFILE
.failed
]
;
then
RESULT
=
1
...
...
bin/rpmbb
View file @
5ad23519
...
...
@@ -118,7 +118,7 @@ do
LOGFILE
=
"
$LOGDIR
/
`
basename
$NAMESRPMIN
.src.rpm
`
$MENVARG
.log"
echo
"Build in native system"
>
$LOGFILE
rm
-f
$LOGFILE
.failed
(
uni_rpmbuild
--commit
$i
-bb
$LISTRPMARGS
$NODEPS
--target
$BUILDARCH
2>&1
||
touch
$LOGFILE
.failed
)
|
tee
-a
$LOGFILE
(
uni_rpmbuild
--commit
$i
-bb
$LISTRPMARGS
$NODEPS
--target
$BUILDARCH
2>&1
||
touch
$LOGFILE
.failed
)
|
tee
-a
$LOGFILE
| colorify
[
-r
"
$LOGFILE
.failed"
]
&&
RET
=
1
||
RET
=
0
if
[
"
$RET
"
=
"0"
]
;
then
...
...
share/eterbuild/functions/common
View file @
5ad23519
...
...
@@ -12,14 +12,19 @@ realpath()
readlink
-f
"
$@
"
}
colorify
()
{
csed
'/(warning|предупреждение):/ p magenta,bold'
'/(error|ошибка):/ p red,bold'
}
print_message
()
{
local
DESC
=
"
$1
"
shift
if
[
-z
"
$TEXTDOMAIN
"
]
;
then
echo
"
$DESC
in
$(
basename
$0
)
:
$@
"
>
&2
echo
"
$DESC
in
$(
basename
$0
)
:
$@
"
| colorify
>
&2
else
echog
"
$DESC
in
$(
basename
$0
)
:
$@
"
>
&2
echog
"
$DESC
in
$(
basename
$0
)
:
$@
"
| colorify
>
&2
fi
}
...
...
@@ -523,4 +528,3 @@ version_more_version()
{
[
"
$2
"
=
"
$(
echo
-e
"
$1
\n
$2
"
|
sort
-n
|
head
-n1
)
"
]
}
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