Replaced backticks with POSIX style commands.

This commit is contained in:
Aaron van Geffen 2015-11-04 18:55:59 +09:00
parent c40ed08406
commit aa0ab945ce
2 changed files with 7 additions and 7 deletions

View File

@ -54,9 +54,9 @@ pushd build
echo OPENRCT2_CMAKE_OPTS = $OPENRCT2_CMAKE_OPTS
if [[ $TARGET == "docker32" ]]
then
PARENT=`readlink -f ../`
chmod a+rwx `pwd`
chmod g+s `pwd`
PARENT=$(readlink -f ../)
chmod a+rwx $(pwd)
chmod g+s $(pwd)
docker run -u travis -v $PARENT:/work/openrct2 -w /work/openrct2/build -i -t openrct2/openrct2:32bit-only bash -c "cmake ../ $OPENRCT2_CMAKE_OPTS && make"
else
cmake -DCMAKE_BUILD_TYPE=Debug $OPENRCT2_CMAKE_OPTS ..

View File

@ -7,7 +7,7 @@ cachedir=.cache
liburl=https://openrct.net/launcher/libs/orctlibs.zip
mkdir -p $cachedir
echo `uname`
echo $(uname)
# Sets default target to "linux", if none specified
TARGET=${TARGET-linux}
@ -104,7 +104,7 @@ function install_local_libs {
echo TARGET = $TARGET
if [[ `uname` == "Darwin" ]]; then
if [[ $(uname) == "Darwin" ]]; then
echo "Installation of OpenRCT2 assumes you have homebrew and use it to install packages."
echo "Check if brew is installed"
@ -162,7 +162,7 @@ if [[ `uname` == "Darwin" ]]; then
popd
popd
fi
elif [[ `uname` == "Linux" ]]; then
elif [[ $(uname) == "Linux" ]]; then
if [[ -z "$TRAVIS" ]]; then
sudo apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 cmake
if [[ -z "$DISABLE_G2_BUILD" ]]; then
@ -197,7 +197,7 @@ fi
download_libs
# mind the gap (trailing space)
if [[ `uname` == "Darwin" ]]; then
if [[ $(uname) == "Darwin" ]]; then
shasum -a 256 $cachedir/orctlibs.zip | cut -f1 -d\ > $libVFile
else
sha256sum $cachedir/orctlibs.zip | cut -f1 -d\ > $libVFile