From 3a590caf23f975d3087d3810e8ee692d5545c947 Mon Sep 17 00:00:00 2001 From: Casey Langen Date: Sun, 13 Feb 2022 19:49:48 -0800 Subject: [PATCH] Use `brew --prefix` instead of hard coding brew path. --- script/archive-standalone-nix.sh | 7 +++++-- script/stage-vendor-libraries.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/script/archive-standalone-nix.sh b/script/archive-standalone-nix.sh index 52bbfd48c..07f330ed8 100755 --- a/script/archive-standalone-nix.sh +++ b/script/archive-standalone-nix.sh @@ -57,7 +57,6 @@ mkdir -p $OUTDIR/lib mkdir -p $OUTDIR/plugins mkdir -p $OUTDIR/locales mkdir -p $OUTDIR/themes -mkdir -p $OUTDIR/share/terminfo cp bin/musikcube $OUTDIR cp bin/musikcubed $OUTDIR @@ -66,7 +65,11 @@ cp bin/lib/* $OUTDIR/lib cp bin/plugins/*.${DLL_EXT} $OUTDIR/plugins cp bin/locales/*.json $OUTDIR/locales cp bin/themes/*.json $OUTDIR/themes -cp -rfp bin/share/terminfo/* $OUTDIR/share/terminfo/ + +if [ $OS == "Darwin" ]; then + mkdir -p $OUTDIR/share/terminfo + cp -rfp bin/share/terminfo/* $OUTDIR/share/terminfo/ +fi strip $OUTDIR/musikcube strip $OUTDIR/musikcubed diff --git a/script/stage-vendor-libraries.sh b/script/stage-vendor-libraries.sh index 9c68d7d90..4fd838e5d 100755 --- a/script/stage-vendor-libraries.sh +++ b/script/stage-vendor-libraries.sh @@ -40,7 +40,7 @@ if [[ "$PLATFORM" == 'Darwin' ]]; then cp vendor/lame-bin/lib/libmp3lame.0.dylib ./bin/lib mkdir -p ./bin/share/terminfo - cp -rfp /opt/homebrew/Cellar/ncurses/6.3/share/terminfo/* ./bin/share/terminfo + cp -rfp $(brew --prefix)/Cellar/ncurses/6.3/share/terminfo/* ./bin/share/terminfo elif [[ "$PLATFORM" == 'Linux' ]]; then echo "[stage-static-vendor-libraries] staging Linux .so files..."