From 84f0deb4415b3815f8751f0e99c0e7c5eacd7bb4 Mon Sep 17 00:00:00 2001
From: Jussi Hagman <juhagman@gmail.com>
Date: Mon, 13 Jan 2020 16:08:59 +0200
Subject: [PATCH 1/2] cleanup

use pushd X/Y/Z ; popd instead of cd X/Y/Z ; cd ../../..
---
 setup_osx.command | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setup_osx.command b/setup_osx.command
index f7b38d763..d244c82f0 100755
--- a/setup_osx.command
+++ b/setup_osx.command
@@ -23,7 +23,7 @@ if [ -z "$(which g++)" ]; then
 fi
 
 echo "Building library 'LibQB'"
-cd internal/c/libqb/os/osx
+pushd internal/c/libqb/os/osx
 rm -f libqb_setup.o
 ./setup_build.command
 if [ ! -f ./libqb_setup.o ]; then
@@ -31,10 +31,10 @@ if [ ! -f ./libqb_setup.o ]; then
   Pause
   exit 1
 fi
-cd ../../../../..
+popd
 
 echo "Building library 'FreeType'"
-cd internal/c/parts/video/font/ttf/os/osx
+pushd internal/c/parts/video/font/ttf/os/osx
 rm -f src.o
 ./setup_build.command
 if [ ! -f ./src.o ]; then
@@ -42,13 +42,13 @@ if [ ! -f ./src.o ]; then
   Pause
   exit 1
 fi
-cd ../../../../../../../..
+popd
 
 echo "Building 'QB64' (~3 min)"
 cp ./internal/source/* ./internal/temp/
-cd internal/c
+pushd internal/c
 g++ -w qbx.cpp libqb/os/osx/libqb_setup.o parts/video/font/ttf/os/osx/src.o -framework GLUT -framework OpenGL -framework Cocoa -o ../../qb64
-cd ../..
+popd
 
 echo ""
 if [ -f ./qb64 ]; then

From 79fd7081da3c50a2ebe70933c50e055e0bd72782 Mon Sep 17 00:00:00 2001
From: Fellippe Heitor <fellippeheitor@gmail.com>
Date: Mon, 13 Jan 2020 11:53:52 -0300
Subject: [PATCH 2/2] Hides the output of pushd/popd.

Manually adds the fix for line 15 -- from a previously merged PR
---
 setup_osx.command | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/setup_osx.command b/setup_osx.command
index d244c82f0..d565e96e5 100755
--- a/setup_osx.command
+++ b/setup_osx.command
@@ -12,18 +12,18 @@ echo ""
 find . -name "*.command" -exec chmod +x {} \;
 find . -type f -iname "*.a" -exec rm -f {} \;
 find . -type f -iname "*.o" -exec rm -f {} \;
-rm /internal/temp/*
+rm ./internal/temp/*
 
 if [ -z "$(which g++)" ]; then
   echo "GNU C++ compiler not detected (g++)"
-  echo "Please install Apple Xcode and Apple Command Line Tools for Xcode"
+  echo "Please install Apple's Command Line Tools for Xcode"
   echo "before launching QB64 setup."
   Pause
   exit 1
 fi
 
 echo "Building library 'LibQB'"
-pushd internal/c/libqb/os/osx
+pushd internal/c/libqb/os/osx >/dev/null
 rm -f libqb_setup.o
 ./setup_build.command
 if [ ! -f ./libqb_setup.o ]; then
@@ -31,10 +31,10 @@ if [ ! -f ./libqb_setup.o ]; then
   Pause
   exit 1
 fi
-popd
+popd >/dev/null
 
 echo "Building library 'FreeType'"
-pushd internal/c/parts/video/font/ttf/os/osx
+pushd internal/c/parts/video/font/ttf/os/osx >/dev/null
 rm -f src.o
 ./setup_build.command
 if [ ! -f ./src.o ]; then
@@ -42,13 +42,13 @@ if [ ! -f ./src.o ]; then
   Pause
   exit 1
 fi
-popd
+popd >/dev/null
 
 echo "Building 'QB64' (~3 min)"
 cp ./internal/source/* ./internal/temp/
-pushd internal/c
+pushd internal/c >/dev/null
 g++ -w qbx.cpp libqb/os/osx/libqb_setup.o parts/video/font/ttf/os/osx/src.o -framework GLUT -framework OpenGL -framework Cocoa -o ../../qb64
-popd
+popd >/dev/null
 
 echo ""
 if [ -f ./qb64 ]; then