Fix scripts using shellcheck
This commit is contained in:
@@ -8,10 +8,11 @@ PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev
|
||||
# Help with unmet dependencies
|
||||
PACKAGES="$PACKAGES libjack0"
|
||||
|
||||
if [ $QT5 ]; then
|
||||
if [ "$QT5" ]; then
|
||||
PACKAGES="$PACKAGES qtbase5-dev qttools5-dev-tools qttools5-dev"
|
||||
else
|
||||
PACKAGES="$PACKAGES libqt4-dev"
|
||||
fi
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
sudo apt-get install -y $PACKAGES
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
cmake -DUSE_WERROR=ON $CMAKE_FLAGS ..
|
||||
|
||||
@@ -2,10 +2,11 @@
|
||||
set -e
|
||||
|
||||
CACHE_DIR=$TRAVIS_BUILD_DIR/apt_mingw_cache/$1
|
||||
mkdir -p $CACHE_DIR
|
||||
mkdir -p "$CACHE_DIR"
|
||||
|
||||
pushd $CACHE_DIR
|
||||
pushd "$CACHE_DIR"
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
apt-get --print-uris --yes install $MINGW_PACKAGES | grep ^\' | cut -d\' -f2 > downloads.list
|
||||
wget -N --input-file downloads.list
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e
|
||||
|
||||
if [ $QT5 ]; then
|
||||
if [ "$QT5" ]; then
|
||||
MINGW_PACKAGES="mingw32-x-qt5base"
|
||||
else
|
||||
MINGW_PACKAGES="mingw32-x-qt"
|
||||
@@ -16,10 +16,13 @@ MINGW_PACKAGES="mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x
|
||||
export MINGW_PACKAGES
|
||||
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
. $DIR/linux.win.download.sh win32
|
||||
|
||||
# shellcheck disable=SC1090
|
||||
. "$DIR/linux.win.download.sh" win32
|
||||
|
||||
PACKAGES="nsis cloog-isl libmpc3 qt4-linguist-tools mingw32 $MINGW_PACKAGES"
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
sudo apt-get install -y $PACKAGES
|
||||
|
||||
# ccache 3.2 is needed because mingw32-x-gcc is version 4.9, which causes cmake
|
||||
|
||||
@@ -3,10 +3,11 @@ set -e
|
||||
|
||||
# First, install 32-bit deps
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
. $DIR/linux.win32.install.sh
|
||||
# shellcheck disable=SC1090
|
||||
. "$DIR/linux.win32.install.sh"
|
||||
|
||||
|
||||
if [ $QT5 ]; then
|
||||
if [ "$QT5" ]; then
|
||||
MINGW_PACKAGES="mingw64-x-qt5base"
|
||||
else
|
||||
MINGW_PACKAGES="mingw64-x-qt"
|
||||
@@ -21,6 +22,8 @@ MINGW_PACKAGES="mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x
|
||||
export MINGW_PACKAGES
|
||||
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
. $DIR/linux.win.download.sh win64
|
||||
# shellcheck disable=SC1090
|
||||
. "$DIR/linux.win.download.sh" win64
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
sudo apt-get install -y $MINGW_PACKAGES
|
||||
|
||||
@@ -2,18 +2,19 @@
|
||||
|
||||
PACKAGES="cmake pkgconfig fftw libogg libvorbis libsndfile libsamplerate jack sdl stk portaudio node fltk"
|
||||
|
||||
if [ $QT5 ]; then
|
||||
if [ "$QT5" ]; then
|
||||
PACKAGES="$PACKAGES homebrew/versions/qt55"
|
||||
else
|
||||
PACKAGES="$PACKAGES cartr/qt4/qt"
|
||||
fi
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
brew install $PACKAGES ccache
|
||||
|
||||
# Recompile fluid-synth without CoreAudio per issues #649
|
||||
# Changes to fluid-synth.rb must be pushed to URL prior to use
|
||||
url=$(git remote get-url origin)
|
||||
branch=$(git symbolic-ref --short HEAD)
|
||||
brew install --build-from-source $url/raw/$branch/cmake/apple/fluid-synth.rb
|
||||
brew install --build-from-source "$url/raw/$branch/cmake/apple/fluid-synth.rb"
|
||||
|
||||
sudo npm install -g appdmg
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
if [ $QT5 ]; then
|
||||
if [ "$QT5" ]; then
|
||||
# Workaround; No FindQt5.cmake module exists
|
||||
export CMAKE_PREFIX_PATH="$(brew --prefix qt55)"
|
||||
CMAKE_PREFIX_PATH="$(brew --prefix qt55)"
|
||||
export CMAKE_PREFIX_PATH
|
||||
fi
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
cmake $CMAKE_FLAGS -DUSE_WERROR=OFF ..
|
||||
|
||||
Reference in New Issue
Block a user