From 9e2cce65d56648c28451ab0dcfe1786862ce958d Mon Sep 17 00:00:00 2001 From: "Pierre Gueth (kingkong)" Date: Fri, 10 Jun 2011 15:33:13 +0200 Subject: [PATCH] more verbose merge and more robust merge_make_release.sh --- cluster_tools/gate_power_merge.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cluster_tools/gate_power_merge.sh b/cluster_tools/gate_power_merge.sh index ed122f7..53da5a9 100755 --- a/cluster_tools/gate_power_merge.sh +++ b/cluster_tools/gate_power_merge.sh @@ -28,7 +28,7 @@ echo -ne '\n' } rootMerger="clitkMergeRootFiles" -test -f "./clitkMergeRootFiles" && rootMerger="./clitkMergeRootFiles" +test -x "./clitkMergeRootFiles" && rootMerger="./clitkMergeRootFiles" function merge_root { local merged="$1" @@ -45,12 +45,12 @@ do let count++ local arguments=" -i ${partial} ${arguments}" done -${rootMerger} ${arguments} 2> /dev/null > /dev/null || error "error while calling ${rootMerger}" +${rootMerger} ${arguments} || warning "error while calling ${rootMerger}" echo " ${indent}merged ${count} files" } statMerger="mergeStatFile.py" -test -f "./mergeStatFile.sh" && statMerger="./mergeStatFile.sh" +test -x "./mergeStatFile.sh" && statMerger="./mergeStatFile.sh" function merge_stat { local merged="$1" @@ -74,7 +74,7 @@ do fi update_bar ${count} "adding ${partial}" - ${statMerger} -i "${merged}" -j "${partial}" -o "${merged}" > /dev/null || error "error while calling ${statMerger}" + ${statMerger} -i "${merged}" -j "${partial}" -o "${merged}" || warning "error while calling ${statMerger}" done end_bar echo " ${indent}merged ${count} files" @@ -107,7 +107,7 @@ do update_bar ${count} "adding ${partial}" local header="$(cat "${merged}" | head -n 6)" local tmp="$(mktemp)" - ${txtImageMerger} -i "${partial}" -j "${merged}" -o "${tmp}" > /dev/null || error "error while calling ${txtImageMerger}" + ${txtImageMerger} -i "${partial}" -j "${merged}" -o "${tmp}" || warning "error while calling ${txtImageMerger}" echo "${header}" > "${merged}" grep -v '## Merge' "${tmp}" >> "${merged}" rm "${tmp}" @@ -117,7 +117,7 @@ echo " ${indent}merged ${count} files" } hdrImageMerger="clitkImageArithm" -test -f "./clitkImageArithm" && hdrImageMerger="./clitkImageArithm" +test -x "./clitkImageArithm" && hdrImageMerger="./clitkImageArithm" function merge_hdr_image { local merged="$1" @@ -144,7 +144,7 @@ do fi update_bar ${count} "adding ${partial}" - ${hdrImageMerger} -t 0 -i "${partial}" -j "${merged}" -o "${merged}" 2> /dev/null > /dev/null || error "error while calling ${hdrImageMerger}" + ${hdrImageMerger} -t 0 -i "${partial}" -j "${merged}" -o "${merged}" || warning "error while calling ${hdrImageMerger}" done end_bar echo " ${indent}merged ${count} files" -- 2.47.1