From 6fbf9e906863bc3ecda0c5e3f5d28304b3f631b0 Mon Sep 17 00:00:00 2001
From: Konstantin Dmitriev <ksee.zelgadis@gmail.com>
Date: Jan 11 2019 10:22:06 +0000
Subject: Rename OSX scripts


---

diff --git a/1-setup-brew.sh b/1-setup-brew.sh
deleted file mode 100755
index 2c4adea..0000000
--- a/1-setup-brew.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-# zlib not required because it is already part of OSX
-
-# Travis-CI workaround
-# When we install a package that is already installed inside the travis VM, and we have an outdated brew
-# (for faster build), then we get an error and the build fails. Unfortunately brew doesn't have switch to skip
-# already installed packages (https://github.com/Homebrew/brew/issues/2491) and recommends to install using
-# brew bundle. But! `brew bundle` can't be run without updating brew and fails with error "Your Homebrew is outdated".
-# Yep, i know what and this is what i want. So here is workaround: first we check which package is not already installed,
-# and if not then install it.
-
-
-set -e
-
-if ! ( which brew >/dev/null ); then
-    echo "No brew found. Installing..."
-    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-fi
-
-WORKDIR=`dirname "$0"`
-pushd "${WORKDIR}" > /dev/null
-WORKDIR=`pwd`
-popd > /dev/null
-
-PACKAGES="adwaita-icon-theme autoconf automake ccache libtool intltool imagemagick gettext pkg-config glibmm libxml++ cairo fftw pango mlt boost gtkmm3 sdl2 sdl2_mixer"
-
-export HOMEBREW_NO_AUTO_UPDATE=1
-export HOMEBREW_NO_ANALYTICS=1
-
-export OS=`uname -r | cut -d "." -f1`
-
-if [ $OS -lt 15 ] && [ -z "$TRAVIS_BUILD_DIR" ]; then # For OSX < 10.11
-    cd /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/
-    git fetch --unshallow || true
-    git checkout a91becd6afc177b0cada2cf9cce2e3bde514053b # librsvg 2.40.20 (wothout rust) 2017.12.16
-    cd /usr/local/Homebrew/
-    git checkout 1.4.1
-    brew info gobject-introspection | grep --quiet 'Not installed' && brew install ${WORKDIR}/autobuild/osx/gobject-introspection.rb
-fi
-
-for pkg in $PACKAGES;
-do
-    echo "Checking $pkg..."
-    brew info "$pkg" | grep --quiet 'Not installed' && brew install "$pkg"
-done
-
-#HOMEBREW_NO_AUTO_UPDATE=1 brew bundle -no-upgrade --file=-<<-EOF
-#brew "autoconf"
-#brew "automake"
-#brew "boost"
-#brew "cairo"
-#brew "fftw"
-#brew "gettext"
-#brew "glibmm"
-#brew "gtkmm3"
-#brew "intltool"
-#brew "libtool"
-#brew "libxml++"
-#brew "mlt"
-#brew "pango"
-#brew "pkg-config"
-#EOF
diff --git a/1-setup-osx-brew.sh b/1-setup-osx-brew.sh
new file mode 100755
index 0000000..2c4adea
--- /dev/null
+++ b/1-setup-osx-brew.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+# zlib not required because it is already part of OSX
+
+# Travis-CI workaround
+# When we install a package that is already installed inside the travis VM, and we have an outdated brew
+# (for faster build), then we get an error and the build fails. Unfortunately brew doesn't have switch to skip
+# already installed packages (https://github.com/Homebrew/brew/issues/2491) and recommends to install using
+# brew bundle. But! `brew bundle` can't be run without updating brew and fails with error "Your Homebrew is outdated".
+# Yep, i know what and this is what i want. So here is workaround: first we check which package is not already installed,
+# and if not then install it.
+
+
+set -e
+
+if ! ( which brew >/dev/null ); then
+    echo "No brew found. Installing..."
+    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+fi
+
+WORKDIR=`dirname "$0"`
+pushd "${WORKDIR}" > /dev/null
+WORKDIR=`pwd`
+popd > /dev/null
+
+PACKAGES="adwaita-icon-theme autoconf automake ccache libtool intltool imagemagick gettext pkg-config glibmm libxml++ cairo fftw pango mlt boost gtkmm3 sdl2 sdl2_mixer"
+
+export HOMEBREW_NO_AUTO_UPDATE=1
+export HOMEBREW_NO_ANALYTICS=1
+
+export OS=`uname -r | cut -d "." -f1`
+
+if [ $OS -lt 15 ] && [ -z "$TRAVIS_BUILD_DIR" ]; then # For OSX < 10.11
+    cd /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/
+    git fetch --unshallow || true
+    git checkout a91becd6afc177b0cada2cf9cce2e3bde514053b # librsvg 2.40.20 (wothout rust) 2017.12.16
+    cd /usr/local/Homebrew/
+    git checkout 1.4.1
+    brew info gobject-introspection | grep --quiet 'Not installed' && brew install ${WORKDIR}/autobuild/osx/gobject-introspection.rb
+fi
+
+for pkg in $PACKAGES;
+do
+    echo "Checking $pkg..."
+    brew info "$pkg" | grep --quiet 'Not installed' && brew install "$pkg"
+done
+
+#HOMEBREW_NO_AUTO_UPDATE=1 brew bundle -no-upgrade --file=-<<-EOF
+#brew "autoconf"
+#brew "automake"
+#brew "boost"
+#brew "cairo"
+#brew "fftw"
+#brew "gettext"
+#brew "glibmm"
+#brew "gtkmm3"
+#brew "intltool"
+#brew "libtool"
+#brew "libxml++"
+#brew "mlt"
+#brew "pango"
+#brew "pkg-config"
+#EOF