# HG changeset patch # User Jacob Alexander # Date 1445216081 25200 # Node ID 0d96d2bbf225353fbbd17d1b0182d4b083b35cfa # Parent 36b047a5afb0582e2637a3883fda32569901244b# Parent 4ca343d30b739f3e4d8d6c3739ab4e21a677097f Merge pull request #65 from r4v5/exit-quickly-on-script-error Exit quickly when cmake or make fail diff -r 36b047a5afb0 -r 0d96d2bbf225 Keyboards/cmake.bash --- a/Keyboards/cmake.bash Sat Oct 17 21:03:07 2015 -0700 +++ b/Keyboards/cmake.bash Sun Oct 18 17:54:41 2015 -0700 @@ -82,7 +82,18 @@ mkdir -p "${BuildPath}" cd "${BuildPath}" cmake -DCHIP="${Chip}" -DCOMPILER="${Compiler}" -DScanModule="${ScanModule}" -DMacroModule="${MacroModule}" -DOutputModule="${OutputModule}" -DDebugModule="${DebugModule}" -DBaseMap="${BaseMap}" -DDefaultMap="${DefaultMap}" -DPartialMaps="${PartialMapsExpanded}" "${CMakeListsPath}" +return_code=$? +if [ $return_code != 0 ] ; then + echo "Error in cmake. Exiting..." + exit $return_code +fi + make +return_code=$? +if [ $return_code != 0 ] ; then + echo "Error in make. Exiting..." + exit $return_code +fi echo "Firmware has been compiled into: '${BuildPath}'" cd -