Merge branch 'master' into openssl

adrienverge · May 13, 2018 · 581d532 · 581d532
2 parents d657cb5 + e9a620f
commit 581d532
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,8 @@ cache:
     - $HOME/.openfortivpn-deps
 
 before_install:
-  - ci/install_astyle.sh $HOME/.openfortivpn-deps
-  - ci/install_openssl.sh $HOME/.openfortivpn-deps
+  - tests/ci/install_astyle.sh $HOME/.openfortivpn-deps
+  - tests/ci/install_openssl.sh $HOME/.openfortivpn-deps
 
 install:
   - ./autogen.sh

diff --git a/ci/install_astyle.sh → tests/ci/install_astyle.sh b/ci/install_astyle.sh → tests/ci/install_astyle.sh
@@ -12,6 +12,6 @@ SRC=https://sourceforge.net/projects/astyle/files/astyle/astyle%20${VERSION}/ast
 
 wget -O astyle.tar.gz $SRC
 tar -xf astyle.tar.gz -C $HOME
-cd $HOME/astyle/build/gcc
+cd ${HOME}/astyle/build/gcc
 make
 make prefix=$PREFIX install
diff --git a/ci/install_openssl.sh → tests/ci/install_openssl.sh b/ci/install_openssl.sh → tests/ci/install_openssl.sh
@@ -4,14 +4,14 @@ set -e
 
 PREFIX=$1
 
-[[ -x $PREFIX/bin/openssl ]] && exit 0
+[[ -x ${PREFIX}/bin/openssl ]] && exit 0
 
 VERSION=1.0.2o
 SRC=https://www.openssl.org/source/openssl-${VERSION}.tar.gz
 
 wget -O openssl.tar.gz $SRC
 tar -xf openssl.tar.gz -C $HOME
-cd $HOME/openssl-$VERSION
+cd ${HOME}/openssl-${VERSION}
 ./config --prefix=$PREFIX shared -fPIC
 make
 make install