diff --git a/run.sh b/run.sh index d4d89656dd77ca300ed231ecfa42af056084c19c..48137381723f13ef6b74a0c11e5392993ef32c2b 100755 --- a/run.sh +++ b/run.sh @@ -16,8 +16,10 @@ root_dir=/shared xml_dir=xml_files report_dir=reports -report_file=report_$current_time.$report_extension xml_subdir=$xml_dir/$current_time +report_subdir=$report_dir/$current_time + +report_file=report_$current_time.$report_extension if [[ ! -z $project ]] then @@ -54,6 +56,7 @@ rm -rf $root_dir/$xml_dir/* rm -rf $root_dir/$report_dir/* mkdir -p $root_dir/$xml_subdir +mkdir -p $root_dir/$report_subdir while IFS= read -r line do @@ -71,7 +74,7 @@ do upload $xml_subdir/$filename done < $root_dir/ips.txt -python /output_report.py $root_dir/$xml_subdir $root_dir/$report_dir/$report_file $root_dir/ips.txt +python /output_report.py $root_dir/$xml_subdir $root_dir/$report_subdir/$report_file $root_dir/ips.txt if [[ $report_extension = "tex" ]] then sed -i 's/_/\\_/g' $root_dir/$report_dir/$report_file @@ -79,4 +82,4 @@ then sed -i 's/#/\\#/g' $root_dir/$report_dir/$report_file sed -i 's/%/\\%/g' $root_dir/$report_dir/$report_file fi -upload $report_dir/$report_file +upload $report_subdir/$report_file