diff --git a/RosBE-Unix/Base-i386/scripts/setuplibrary.sh b/RosBE-Unix/Base-i386/scripts/setuplibrary.sh index bc077a4..c12dd33 100644 --- a/RosBE-Unix/Base-i386/scripts/setuplibrary.sh +++ b/RosBE-Unix/Base-i386/scripts/setuplibrary.sh @@ -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.