Browse Source

osx: fix dependency installation failure when deps are already installed

copy-dylibs-in-bottle
Alexandros Theodotou 3 years ago
parent
commit
697e70437e
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 16
      installer-osx.sh.in
  2. 3
      tools/gen_osx_installer_brew.sh

16
installer-osx.sh.in

@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
set -e
zrythm_ver="@VERSION@"
carla_ver="@CARLA_VERSION@"
zplugins_ver="@ZPLUGINS_VERSION@"
show_error () {
@ -64,15 +65,22 @@ if [ $proceed -ne 0 ]; then @@ -64,15 +65,22 @@ if [ $proceed -ne 0 ]; then
# link
echo "Linking..."
brew link carla-git
brew link --overwrite zrythm@TRIAL@
brew switch carla-git $carla_ver || true
brew switch zrythm@TRIAL@ $zrythm_ver || true
brew unlink carla-git && \
brew link --overwrite carla-git && \
brew switch carla-git $carla_ver
brew unlink zrythm@TRIAL@ && \
brew link --overwrite zrythm@TRIAL@ && \
brew switch zrythm@TRIAL@ $zrythm_ver
# install deps
echo "Installing deps..."
zrythm_deps="$(brew info zrythm@TRIAL@ | grep Required | sed -e "s/Required: //" | sed -e "s/, / /g" | sed -e "s/carla-git//")"
carla_deps="$(brew info carla-git | grep Required | sed -e "s/Required: //" | sed -e "s/, / /g")"
brew install $carla_deps
brew install $zrythm_deps
brew upgrade
brew install $carla_deps || true
brew install $zrythm_deps || true
# fix paths
echo "Fixing paths..."

3
tools/gen_osx_installer_brew.sh

@ -70,12 +70,15 @@ elif [ "$bottle_or_zip" = "zip" ]; then @@ -70,12 +70,15 @@ elif [ "$bottle_or_zip" = "zip" ]; then
cp installer-osx.sh.in $tmp/installer.sh
sed -i -e "s/@VERSION@/$zrythm_version/" \
$tmp/installer.sh
sed -i -e "s/@CARLA_VERSION@/0.1.1/" \
$tmp/installer.sh
if [[ "$bottle_filename" == *"rial"* ]]; then
cp README-osx-trial.in $tmp/README
sed -i -e "s/@TRIAL@/-trial/g" \
$tmp/installer.sh
else
cp README-osx.in $tmp/README
sed -i -e "s/@_AT_@/@/g" $tmp/README
sed -i -e "s/@TRIAL@//g" $tmp/installer.sh
fi
sed -i -e "s/@VERSION@/$zrythm_version/" \

Loading…
Cancel
Save