Merge branch 'master' of github.com:madcowswe/ODrive into devel

This commit is contained in:
Samuel Sadok
2019-01-31 01:22:35 +01:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -33,7 +33,7 @@ install:
- export TUP_DIR=$HOME/dl/tup_0.7.5-0~16.04.york0_amd64
- export TUP_ARCHIVE=$HOME/dl/tup_0.7.5-0~16.04.york0_amd64.deb
- export TUP_URL=http://ppa.launchpad.net/jonathonf/tup/ubuntu/pool/main/t/tup/tup_0.7.5-0~16.04.york0_amd64.deb
- export TUP_URL=http://ppa.launchpad.net/jonathonf/tup/ubuntu/pool/main/t/tup/tup_0.7.8-2~16.04.york0_amd64.deb
- if [ ! -e $TUP_DIR/bin/tup ]; then wget $TUP_URL -O $TUP_ARCHIVE; dpkg-deb -R $TUP_ARCHIVE $TUP_DIR; fi
- export PATH=$PATH:$TUP_DIR/usr/bin
+1
View File
@@ -15,6 +15,7 @@ export CONFIG_STRICT=true
rm -rdf build
mkdir -p build
env | grep ^CONFIG > tup.config
tup init
tup generate ./tup_build.sh
bash -xe ./tup_build.sh