File tree Expand file tree Collapse file tree 1 file changed +15
-2
lines changed Expand file tree Collapse file tree 1 file changed +15
-2
lines changed Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ function parse_boolean() {
28
28
parse_boolean " $METAFIX_DISABLE_TO_DO " && disable_todo=1 || disable_todo=
29
29
parse_boolean " $METAFIX_INTEGRATION_TEST_PROFILE " && noprofile= || noprofile=no
30
30
parse_boolean " $METAFIX_KEEP_TEMP " && keep_temp=1 || keep_temp=
31
+ parse_boolean " $CI " && ci=1 || ci=
31
32
32
33
[ -t 1 -a -x /usr/bin/colordiff ] && colordiff=colordiff || colordiff=cat
33
34
@@ -122,11 +123,23 @@ function get_file() {
122
123
return 1
123
124
}
124
125
126
+ function log_file() {
127
+ if [ -s " $1 " ]; then
128
+ log " $2$1 "
129
+
130
+ if [ " $3 " -ne 0 -a -n " $ci " ]; then
131
+ cat " $1 "
132
+ fi
133
+ else
134
+ rm_temp " $1 "
135
+ fi
136
+ }
137
+
125
138
function command_info() {
126
139
log " ${color_info}${1^} command exit status$color_reset : $2 "
127
140
128
- [ -s " $3 " ] && log " ${color_info}${1^} command output$color_reset : $3 " || rm_temp " $3 "
129
- [ -s " $4 " ] && log " ${color_info}${1^} command error$color_reset : $4 " || rm_temp " $4 "
141
+ log_file " $3 " " ${color_info}${1^} command output$color_reset : " " $2 "
142
+ log_file " $4 " " ${color_info}${1^} command error$color_reset : " " $2 "
130
143
131
144
log
132
145
}
You can’t perform that action at this time.
0 commit comments