mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Fix osx travis - use bootstrap-osx.sh
This commit is contained in:
parent
ab769d1175
commit
5a02091441
@ -37,6 +37,7 @@ QTOX_DIR="${MAIN_DIR}/qTox" # Change to Git location
|
|||||||
TOXCORE_DIR="${MAIN_DIR}/toxcore" # Change to Git location
|
TOXCORE_DIR="${MAIN_DIR}/toxcore" # Change to Git location
|
||||||
|
|
||||||
FA_DIR="${MAIN_DIR}/filter_audio"
|
FA_DIR="${MAIN_DIR}/filter_audio"
|
||||||
|
FA_INSTALL_PREFIX="${QTOX_DIR}/libs"
|
||||||
|
|
||||||
BUILD_DIR="${MAIN_DIR}/qTox-Mac_Build" # Change if needed
|
BUILD_DIR="${MAIN_DIR}/qTox-Mac_Build" # Change if needed
|
||||||
|
|
||||||
@ -119,19 +120,22 @@ function install() {
|
|||||||
fcho "Cloning qTox git ... "
|
fcho "Cloning qTox git ... "
|
||||||
git clone https://github.com/tux3/qTox.git
|
git clone https://github.com/tux3/qTox.git
|
||||||
fi
|
fi
|
||||||
|
# filter_audio
|
||||||
if [ -e $FA_DIR/.git/index ]; then # Check if this exists
|
if [ -e $FA_DIR/.git/index ]; then # Check if this exists
|
||||||
fcho "Filter_Audio git repo already inplace !"
|
fcho "Filter_Audio git repo already inplace !"
|
||||||
cd $FA_DIR
|
cd $FA_DIR
|
||||||
git pull
|
git pull
|
||||||
fcho "Please enter your password to install Filter_Audio:"
|
|
||||||
sudo make install
|
|
||||||
else
|
else
|
||||||
fcho "Cloning Filter_Audio git ... "
|
fcho "Cloning Filter_Audio git ... "
|
||||||
git clone https://github.com/irungentoo/filter_audio.git
|
git clone https://github.com/irungentoo/filter_audio.git
|
||||||
cd $FA_DIR
|
cd $FA_DIR
|
||||||
fcho "Please enter your password to install Filter_Audio:"
|
|
||||||
sudo make install
|
|
||||||
fi
|
fi
|
||||||
|
if [ ! -e "$FA_INSTALL_PREFIX" ]; then
|
||||||
|
mkdir "$FA_INSTALL_PREFIX"
|
||||||
|
fi
|
||||||
|
fcho "Please enter your password to install Filter_Audio:"
|
||||||
|
make install PREFIX="${FA_INSTALL_PREFIX}"
|
||||||
|
# toxcore
|
||||||
if [[ $TRAVIS = true ]]; then #travis check
|
if [[ $TRAVIS = true ]]; then #travis check
|
||||||
build-toxcore
|
build-toxcore
|
||||||
else
|
else
|
||||||
@ -143,6 +147,7 @@ function install() {
|
|||||||
fcho "You can simply use the -u command and say [Yes/n] when prompted"
|
fcho "You can simply use the -u command and say [Yes/n] when prompted"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
$QTOX_DIR/bootstrap-osx.sh
|
||||||
}
|
}
|
||||||
|
|
||||||
function update() {
|
function update() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user