diff --git a/setup.sh b/setup.sh index 25dae22b5e8a470e44f7bb3e9bc37596ddf28adb..6f73a5b260fdb324dac9ce9f8f5dbd575cd86d2b 100755 --- a/setup.sh +++ b/setup.sh @@ -13,10 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -ex - # Ensure the script doesn't fail on Github workflows export TERM=${TERM:-vt100} +done_text="$(tput bold)DONE.$(tput sgr0)" + +set -ex # Check that rustup and pip3 are installed check_command () { @@ -32,8 +33,6 @@ check_command pip3 # Ensure the submodules are pulled and up-to-date git submodule update --init -done_text="$(tput bold)DONE.$(tput sgr0)" - patch_conflict_detected () { cat <<EOF