From f976df573025626969e0f59b98f4b8449b91d7d3 Mon Sep 17 00:00:00 2001 From: James Chen-Smith <15643597+jameschensmith@users.noreply.github.com> Date: Thu, 29 Oct 2020 02:34:22 -0500 Subject: [PATCH] Refer to homebrew/core formula instead of custom tap (#307) --- .ci/install.sh | 2 +- .github/workflows/installation_script.yml | 4 ++-- README.md | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.ci/install.sh b/.ci/install.sh index d0bae15..fb2e093 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -70,7 +70,7 @@ set_filename() { download_fnm() { if [ "$USE_HOMEBREW" == "true" ]; then - brew install Schniz/tap/fnm > /dev/null + brew install fnm else if [ "$RELEASE" == "latest" ]; then URL="https://github.com/Schniz/fnm/releases/latest/download/$FILENAME.zip" diff --git a/.github/workflows/installation_script.yml b/.github/workflows/installation_script.yml index 1945731..a079e25 100644 --- a/.github/workflows/installation_script.yml +++ b/.github/workflows/installation_script.yml @@ -66,8 +66,8 @@ jobs: - run: "sudo apt-get install -y ${{ matrix.shell }}" name: Install ${{matrix.shell}} using apt-get if: matrix.setup.os == 'ubuntu' - - run: "brew install ${{ matrix.shell }}" - name: Install ${{matrix.shell}} using Homebrew + - run: "brew update && brew install ${{ matrix.shell }}" + name: Update formulae and install ${{matrix.shell}} using Homebrew if: matrix.setup.os == 'macos' - run: | if [ -f ~/.bashrc ]; then diff --git a/README.md b/README.md index 36dcb18..a03c6f5 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ curl -fsSL https://fnm.vercel.app/install | bash #### Upgrade -On OSX, it is a simple as `brew upgrade Schniz/tap/fnm`. +On OSX, it is a simple as `brew upgrade fnm`. On other operating systems, upgrading `fnm` is almost the same as installing it. To prevent duplication in your shell config file add `--skip-shell` to install command. @@ -62,10 +62,8 @@ curl -fsSL https://fnm.vercel.app/install | bash -s -- --install-dir "./.fnm" -- #### Using Homebrew (OSX) -[This is a custom tap I'm maintaining](https://github.com/Schniz/homebrew-tap), and will be used until fnm will move to the official one. - ```bash -brew install Schniz/tap/fnm +brew install fnm ``` Then apply the changes the installer prints, to set up your shell profile.