Merge master into develop (#1063)

- pick up translation changes
- clean up trailing spaces
This commit is contained in:
Rachel Fenichel
2017-04-24 16:08:21 -07:00
committed by GitHub
parent 28572dadac
commit 74adf30355
44 changed files with 2105 additions and 1959 deletions

View File

@@ -2,15 +2,15 @@
os_name=`uname`
chromedriver_dir="chromedriver"
if [ ! -d $chromedriver_dir ]; then
mkdir $chromedriver_dir
mkdir $chromedriver_dir
fi
if [[ $os_name == 'Linux' ]]; then
cd chromedriver && curl -L https://chromedriver.storage.googleapis.com/2.29/chromedriver_linux64.zip > tmp.zip && unzip -o tmp.zip && rm tmp.zip
cd chromedriver && curl -L https://chromedriver.storage.googleapis.com/2.29/chromedriver_linux64.zip > tmp.zip && unzip -o tmp.zip && rm tmp.zip
# wait until download finish
sleep 5
elif [[ $os_name == 'Darwin' ]]; then
cd chromedriver && curl -L https://chromedriver.storage.googleapis.com/2.29/chromedriver_mac64.zip | tar xz
cd chromedriver && curl -L https://chromedriver.storage.googleapis.com/2.29/chromedriver_mac64.zip | tar xz
# wait until download finish
sleep 5
fi

View File

@@ -5,11 +5,11 @@ FILE=selenium-server-standalone-3.0.1.jar
if [ ! -d $DIR ]; then
mkdir $DIR
fi
if [ ! -f $DIR/$FILE ]; then
cd $DIR && curl -O http://selenium-release.storage.googleapis.com/3.0/selenium-server-standalone-3.0.1.jar
sleep 5
fi