diff --git a/VERSION.txt b/VERSION.txt index f0bb29e76..6261a05bb 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.3.0 +1.3.1 \ No newline at end of file diff --git a/scripts/linux/base_build.sh b/scripts/linux/base_build.sh index 80144b4d1..39b325c4d 100755 --- a/scripts/linux/base_build.sh +++ b/scripts/linux/base_build.sh @@ -1340,23 +1340,25 @@ fi # this is common to Mac and Linux, so it needs to be outside of the above if [ $PREREQS -eq 1 ]; then - if [ -d $SCRIMMAGE_GIT_ROOT ]; then - cd $INSTALL_DIR - rm -rf scrimmage - fi - - echo "Installing SCRIMMAGE Dependencies" - cd $INSTALL_DIR - git clone https://github.com/gtri/scrimmage - SCRIMMAGE_REPO_RESULT=$? + if [ $SCRIMMAGE -eq 1 ]; then + if [ -d $SCRIMMAGE_GIT_ROOT ]; then + cd $INSTALL_DIR + rm -rf scrimmage + fi - cd scrimmage - sudo ./setup/install-binaries.sh -e 0 -p 3 - sudo add-apt-repository -y ppa:kevin-demarco/scrimmage - sudo apt-get update - sudo apt-get install scrimmage-dependencies - source /opt/scrimmage/*/setup.sh - echo "SCRIMMAGE Dependencies Installed" + echo "Installing SCRIMMAGE Dependencies" + cd $INSTALL_DIR + git clone https://github.com/gtri/scrimmage + SCRIMMAGE_REPO_RESULT=$? + + cd scrimmage + sudo ./setup/install-binaries.sh -e 0 -p 3 + sudo add-apt-repository -y ppa:kevin-demarco/scrimmage + sudo apt-get update + sudo apt-get install scrimmage-dependencies + source /opt/scrimmage/*/setup.sh + echo "SCRIMMAGE Dependencies Installed" + fi if [ $OSC -eq 1 ]; then if [ ! -d $OSC_ROOT ]; then