reactos/RosBE
1
0
Fork 0
mirror of https://github.com/reactos/RosBE.git synced 2024-11-23 03:19:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ROSBE-UNIX] Remove no longer needed rs_do_command_can_fail()

Browse Source
This commit is contained in:
Colin Finck 2020-05-23 19:13:40 +02:00
parent 8d953dd8a6
commit ba3b975184
No known key found for this signature in database
GPG Key ID: 1BA74E70456BA1A9
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
RosBE-Unix/Base-i386/scripts/setuplibrary.sh
View File

@ -130,22 +130,15 @@ rs_check_requirements()
# Check whether the previous command finished with errorlevel 0
# If it did so, print a green "OK" and delete the debug logfile for the command.
# If that wasn't the case, print a red "FAILED" and give information about the debug logfile.
# Parameter 1: Can fail, if set to 0, failure leads to process termination
rs_check_run()
{
if [ $? -ne 0 ]; then
if [ $1 -eq 0 ]; then
rs_redmsg "FAILED"
echo "Please take a look at the log file \"$rs_workdir/build.log\""
echo "If you did not do something wrong, please save the log file and contact the ReactOS Team."
rs_redmsg "FAILED"
echo "Please take a look at the log file \"$rs_workdir/build.log\""
echo "If you did not do something wrong, please save the log file and contact the ReactOS Team."
echo "Aborted!"
exit 1
else
rs_yellowmsg "ERRORS"
cat "$rs_workdir/build.log" >> "$rs_workdir/build-ignored.log"
rm "$rs_workdir/build.log"
fi
echo "Aborted!"
exit 1
else
rs_greenmsg "OK"
rm "$rs_workdir/build.log"
@ -169,17 +162,7 @@ rs_do_command()
{
echo -n "Running \"$*\"... "
$* >& "$rs_workdir/build.log"
rs_check_run 0
}
# Executes a building command and checks whether it succeeded.
# Doesn't terminate the building process in case of failure.
# Parameters: The command to execute including parameters
rs_do_command_can_fail()
{
echo -n "Running \"$*\"... "
$* >& "$rs_workdir/build.log"
rs_check_run 1
rs_check_run
}
# Checks whether the given module needs to be processed and if so, extracts it.