StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

refactor(build): make bootstrap.sh more aware of spaces in paths

Browse Source
This commit is contained in:
Zetok Zalbavar 2016-09-28 03:37:01 +01:00
parent 427176ae02
commit 8b0f3912b1
No known key found for this signature in database
GPG Key ID: C953D3880212068A
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bootstrap.sh
View File

@ -35,7 +35,7 @@ SCRIPT_DIR=$( cd $(dirname $0); pwd -P)
INSTALL_DIR=libs INSTALL_DIR=libs
# just for convenience # just for convenience
BASE_DIR=${SCRIPT_DIR}/${INSTALL_DIR} BASE_DIR="${SCRIPT_DIR}/${INSTALL_DIR}"
# directory names of cloned repositories # directory names of cloned repositories
TOX_CORE_DIR=libtoxcore-latest TOX_CORE_DIR=libtoxcore-latest
@ -110,13 +110,13 @@ echo "keep build files : ${KEEP_BUILD_FILES}"
############### prepare step ############### ############### prepare step ###############
# create BASE_DIR directory if necessary # create BASE_DIR directory if necessary
mkdir -p ${BASE_DIR} mkdir -p "${BASE_DIR}"
# remove not needed dirs # remove not needed dirs
remove_build_dirs() { remove_build_dirs() {
rm -rf ${BASE_DIR}/${TOX_CORE_DIR} rm -rf "${BASE_DIR}/${TOX_CORE_DIR}"
rm -rf ${BASE_DIR}/${SQLCIPHER_DIR} rm -rf "${BASE_DIR}/${SQLCIPHER_DIR}"
} }
@ -130,7 +130,7 @@ remove_build_dirs
#install libtoxcore #install libtoxcore
if [[ $INSTALL_TOX = "true" ]]; then if [[ $INSTALL_TOX = "true" ]]; then
git clone https://github.com/irungentoo/toxcore.git \ git clone https://github.com/irungentoo/toxcore.git \
${BASE_DIR}/${TOX_CORE_DIR} --depth 1 "${BASE_DIR}/${TOX_CORE_DIR}" --depth 1
pushd ${BASE_DIR}/${TOX_CORE_DIR} pushd ${BASE_DIR}/${TOX_CORE_DIR}
./autogen.sh ./autogen.sh
@ -168,11 +168,11 @@ fi
#install sqlcipher #install sqlcipher
if [[ $INSTALL_SQLCIPHER = "true" ]]; then if [[ $INSTALL_SQLCIPHER = "true" ]]; then
git clone https://github.com/sqlcipher/sqlcipher.git \ git clone https://github.com/sqlcipher/sqlcipher.git \
${BASE_DIR}/${SQLCIPHER_DIR} \ "${BASE_DIR}/${SQLCIPHER_DIR}" \
--depth 1 \ --depth 1 \
--branch v3.4.0 --branch v3.4.0
pushd ${BASE_DIR}/${SQLCIPHER_DIR} pushd "${BASE_DIR}/${SQLCIPHER_DIR}"
autoreconf -if autoreconf -if
if [[ $SYSTEM_WIDE = "false" ]]; then if [[ $SYSTEM_WIDE = "false" ]]; then