Merge branch 'master' into JOSHUA-327
diff --git a/.travis.yml b/.travis.yml
index 8f78ca2..e22f732 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@
- sudo apt-get -y update
- sudo apt-get -y install build-essential libboost-all-dev zlib1g-dev libbz2-dev liblzma-dev cmake cmake-data
- export JOSHUA=`pwd`
- - ./download-deps.sh
+ - ./download-deps.sh yes-i-want-non-apache-licensed-software
- os: osx
osx_image: xcode8
before_install:
diff --git a/download-deps.sh b/download-deps.sh
index 65d4eba..969588c 100755
--- a/download-deps.sh
+++ b/download-deps.sh
@@ -14,12 +14,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-echo "Warning: this script downloads many tools used in building and running Joshua."
-echo "Not all of them are Apache Licensed. If you wish to continue, type 'y' and hit Enter".
-echo -n "Continue? (y to continue) "
-read j
-if [[ $j != 'y' ]]; then
- echo "Quitting."
+if [[ $1 = "yes-i-want-non-apache-licensed-software" ]]; then
+ echo "Warning: this script downloads many tools used in building and running Joshua."
+ echo "Not all of them are Apache Licensed. The argument passed to this script has"
+ echo "been interpreted as preemptive acknowledgment of this fact."
+ sleep 5
+else
+ echo "Warning: this script downloads many tools used in building and running Joshua."
+ echo "Not all of them are Apache Licensed. If you wish to continue, type 'y' and hit Enter".
+ echo -n "Continue? (y to continue) "
+ read j
+ if [[ $j != 'y' ]]; then
+ echo "Quitting."
+ fi
fi
git clone https://github.com/kpu/kenlm.git ext/kenlm
