rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1207 from tom-tan/fix-qt5-path 

Fix osx_environment.sh for Homebrew
This commit is contained in:
Povilas Kanapickas 2021-06-23 15:32:07 +03:00 committed by GitHub
parent 649fdfe042 ac5de110c0
commit f7be30cc3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/macos/bundle/build_dist.sh.in vendored
View File

@ -48,7 +48,7 @@ fi
# Check for macdeployqt on Homebrew # Check for macdeployqt on Homebrew
if which -s brew ; then if which -s brew ; then
info "Homebrew found, searching for macdeployqt" info "Homebrew found, searching for macdeployqt"
DEPLOYQT="$(brew list qt | grep --only '/.*macdeployqt' | head -1)" DEPLOYQT="$(brew list qt@5 | grep --only '/.*macdeployqt' | head -1)"
if [ ! -x "$DEPLOYQT" ]; then if [ ! -x "$DEPLOYQT" ]; then
error Please install package qt error Please install package qt
exit 1 exit 1
@ -70,4 +70,4 @@ else
-executable="$B_BARRIERC" \ -executable="$B_BARRIERC" \
-executable="$B_BARRIERS" || exit 1 -executable="$B_BARRIERS" || exit 1
success "Bundle created successfully" success "Bundle created successfully"
fi fi

2
osx_environment.sh
View File

@ -29,7 +29,7 @@ if [ ! $BARRIER_BUILD_ENV ]; then
elif command -v brew; then elif command -v brew; then
printf "Detected Homebrew\n" printf "Detected Homebrew\n"
QT_PATH=$(brew --prefix qt) QT_PATH=$(brew --prefix qt@5)
OPENSSL_PATH=$(brew --prefix openssl) OPENSSL_PATH=$(brew --prefix openssl)
check_dir_exists "$QT_PATH" 'qt' check_dir_exists "$QT_PATH" 'qt'