Skip to content

Commit

Permalink
* Fixed an issue with prereqs in linux/base_build.sh that was forcing…
Browse files Browse the repository at this point in the history
… SCRIMMAGE prereqs even if SCRIMMAGE hadn't been selected for install

* Updated version to 1.3.1
  • Loading branch information
jredmondson committed Oct 7, 2021
1 parent e09033e commit f9ec31c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.0
1.3.1
34 changes: 18 additions & 16 deletions scripts/linux/base_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f9ec31c

Please # to comment.