diff --git a/Casks/mounty.rb b/Casks/mounty.rb index a6a3ca9..77cbfd5 100644 --- a/Casks/mounty.rb +++ b/Casks/mounty.rb @@ -11,13 +11,12 @@ cask "mounty" do version "2.1" sha256 "2aeeb012ebaf1d60767d268e48c8b90726e3f05b2e35945f4293c11fbad84381" - depends_on cask: "macfuse" - depends_on formula: "gromgit/fuse/ntfs-3g-mac" - livecheck do url :homepage regex(/Latest\s+version:\s*(\d+(?:\.\d+)+)/i) end + depends_on cask: "macfuse" + depends_on formula: "gromgit/fuse/ntfs-3g-mac" end url "https://mounty.app/releases/Mounty-#{version}.dmg" diff --git a/Formula/btfs-mac.rb b/Formula/btfs-mac.rb index 8f07d82..3a7aa5b 100644 --- a/Formula/btfs-mac.rb +++ b/Formula/btfs-mac.rb @@ -3,7 +3,7 @@ require_relative "../require/macfuse" class BtfsMac < Formula desc "BitTorrent filesystem based on FUSE" homepage "https://github.com/johang/btfs" - url "https://github.com/johang/btfs/archive/v2.24.tar.gz" + url "https://github.com/johang/btfs/archive/refs/tags/v2.24.tar.gz" sha256 "d71ddefe3c572e05362542a0d9fd0240d8d4e1578ace55a8b3245176e7fd8935" license "GPL-3.0-only" head "https://github.com/johang/btfs.git" diff --git a/Formula/cryfs-mac.rb b/Formula/cryfs-mac.rb index 04b33f7..a84e062 100644 --- a/Formula/cryfs-mac.rb +++ b/Formula/cryfs-mac.rb @@ -7,6 +7,8 @@ class CryfsMac < Formula sha256 "18f68e0defdcb7985f4add17cc199b6653d5f2abc6c4d237a0d48ae91a6c81c0" license "LGPL-3.0-only" + head "https://github.com/cryfs/cryfs.git", branch: "develop", shallow: false + bottle do root_url "https://github.com/gromgit/homebrew-fuse/releases/download/cryfs-mac-0.11.3" sha256 cellar: :any, arm64_monterey: "225fae9b8f7deff22021f8246b0c5cfcb7ed2148a203db913129f51fd2127e70" @@ -15,10 +17,6 @@ class CryfsMac < Formula sha256 cellar: :any, catalina: "2bb057bb09d92948c76f563fa2347b0260b2c00872655b30dc83b4a54ca4bd74" end - head do - url "https://github.com/cryfs/cryfs.git", branch: "develop", shallow: false - end - depends_on "cmake" => :build depends_on "conan" => :build depends_on "ninja" => :build diff --git a/Formula/dislocker-mac.rb b/Formula/dislocker-mac.rb index c93ad02..7c2f6aa 100644 --- a/Formula/dislocker-mac.rb +++ b/Formula/dislocker-mac.rb @@ -3,7 +3,7 @@ require_relative "../require/macfuse" class DislockerMac < Formula desc "FUSE driver to read/write Windows' BitLocker-ed volumes" homepage "https://github.com/Aorimn/dislocker" - url "https://github.com/Aorimn/dislocker/archive/v0.7.3.tar.gz" + url "https://github.com/Aorimn/dislocker/archive/refs/tags/v0.7.3.tar.gz" sha256 "8d5275577c44f2bd87f6e05dd61971a71c0e56a9cbedf000bd38deadd8b6c1e6" license "GPL-2.0-or-later" revision 1 diff --git a/Formula/encfs-mac.rb b/Formula/encfs-mac.rb index 0e31ccf..9bcab72 100644 --- a/Formula/encfs-mac.rb +++ b/Formula/encfs-mac.rb @@ -3,7 +3,7 @@ require_relative "../require/macfuse" class EncfsMac < Formula desc "Encrypted pass-through FUSE file system" homepage "https://vgough.github.io/encfs/" - url "https://github.com/vgough/encfs/archive/v1.9.5.tar.gz" + url "https://github.com/vgough/encfs/archive/refs/tags/v1.9.5.tar.gz" sha256 "4709f05395ccbad6c0a5b40a4619d60aafe3473b1a79bafb3aa700b1f756fd63" # The code comprising the EncFS library (libencfs) is licensed under the LGPL. # The main programs (encfs, encfsctl, etc) are licensed under the GPL. diff --git a/Formula/ext4fuse-mac.rb b/Formula/ext4fuse-mac.rb index 651f223..d170aeb 100644 --- a/Formula/ext4fuse-mac.rb +++ b/Formula/ext4fuse-mac.rb @@ -3,7 +3,7 @@ require_relative "../require/macfuse" class Ext4fuseMac < Formula desc "Read-only implementation of ext4 for FUSE" homepage "https://github.com/gerard/ext4fuse" - url "https://github.com/gerard/ext4fuse/archive/v0.1.3.tar.gz" + url "https://github.com/gerard/ext4fuse/archive/refs/tags/v0.1.3.tar.gz" sha256 "550f1e152c4de7d4ea517ee1c708f57bfebb0856281c508511419db45aa3ca9f" license "GPL-2.0-only" head "https://github.com/gerard/ext4fuse.git" diff --git a/Formula/gcsfuse-mac.rb b/Formula/gcsfuse-mac.rb index ebfc829..330b09e 100644 --- a/Formula/gcsfuse-mac.rb +++ b/Formula/gcsfuse-mac.rb @@ -3,7 +3,7 @@ require_relative "../require/macfuse" class GcsfuseMac < Formula desc "User-space file system for interacting with Google Cloud" homepage "https://github.com/googlecloudplatform/gcsfuse" - url "https://github.com/GoogleCloudPlatform/gcsfuse/archive/v0.42.5.tar.gz" + url "https://github.com/GoogleCloudPlatform/gcsfuse/archive/refs/tags/v0.42.5.tar.gz" sha256 "272ad522ebbbfe3da87ee00aeff5fe347d25a4a49499c254e482a59bbed5c692" license "Apache-2.0" head "https://github.com/GoogleCloudPlatform/gcsfuse.git" diff --git a/Formula/gitfs-mac.rb b/Formula/gitfs-mac.rb index b14d72b..8e01ba5 100644 --- a/Formula/gitfs-mac.rb +++ b/Formula/gitfs-mac.rb @@ -5,7 +5,7 @@ class GitfsMac < Formula desc "Version controlled file system" homepage "https://www.presslabs.com/gitfs" - url "https://github.com/presslabs/gitfs/archive/0.5.2.tar.gz" + url "https://github.com/presslabs/gitfs/archive/refs/tags/0.5.2.tar.gz" sha256 "921e24311e3b8ea3a5448d698a11a747618ee8dd62d5d43a85801de0b111cbf3" license "Apache-2.0" revision 1 diff --git a/Formula/ifuse-mac.rb b/Formula/ifuse-mac.rb index 58d65d7..fb59043 100644 --- a/Formula/ifuse-mac.rb +++ b/Formula/ifuse-mac.rb @@ -3,7 +3,7 @@ require_relative "../require/macfuse" class IfuseMac < Formula desc "FUSE module for iOS devices" homepage "https://www.libimobiledevice.org/" - url "https://github.com/libimobiledevice/ifuse/archive/1.1.4.tar.gz" + url "https://github.com/libimobiledevice/ifuse/archive/refs/tags/1.1.4.tar.gz" sha256 "2a00769e8f1d8bad50898b9d00baf12c8ae1cda2d19ff49eaa9bf580e5dbe78c" license "LGPL-2.1-or-later" head "https://cgit.sukimashita.com/ifuse.git" diff --git a/Formula/rclone-mac.rb b/Formula/rclone-mac.rb index b9a540b..56b43cb 100644 --- a/Formula/rclone-mac.rb +++ b/Formula/rclone-mac.rb @@ -3,7 +3,7 @@ require_relative "../require/macfuse" class RcloneMac < Formula desc "Rsync for cloud storage (with macOS FUSE mount support)" homepage "https://rclone.org/" - url "https://github.com/rclone/rclone/archive/v1.62.2.tar.gz" + url "https://github.com/rclone/rclone/archive/refs/tags/v1.62.2.tar.gz" sha256 "6741c81ae5b5cb48a04055f280f6e220ed4b35d26fe43f59510d0f7740044748" license "MIT" head "https://github.com/rclone/rclone.git" diff --git a/Formula/rofs-filtered-mac.rb b/Formula/rofs-filtered-mac.rb index fb4d64e..b9c212d 100644 --- a/Formula/rofs-filtered-mac.rb +++ b/Formula/rofs-filtered-mac.rb @@ -3,7 +3,7 @@ require_relative "../require/macfuse" class RofsFilteredMac < Formula desc "Filtered read-only filesystem for FUSE" homepage "https://github.com/gburca/rofs-filtered/" - url "https://github.com/gburca/rofs-filtered/archive/rel-1.7.tar.gz" + url "https://github.com/gburca/rofs-filtered/archive/refs/tags/rel-1.7.tar.gz" sha256 "d66066dfd0274a2fb7b71dd929445377dd23100b9fa43e3888dbe3fc7e8228e8" license "GPL-2.0-or-later" diff --git a/Formula/s3fs-mac.rb b/Formula/s3fs-mac.rb index c1086a7..a827ffe 100644 --- a/Formula/s3fs-mac.rb +++ b/Formula/s3fs-mac.rb @@ -3,7 +3,7 @@ require_relative "../require/macfuse" class S3fsMac < Formula desc "FUSE-based file system backed by Amazon S3" homepage "https://github.com/s3fs-fuse/s3fs-fuse/wiki" - url "https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.92.tar.gz" + url "https://github.com/s3fs-fuse/s3fs-fuse/archive/refs/tags/v1.92.tar.gz" sha256 "76ebea3c0784c5c0f6b84e009d555806aff86258886ced39eee316bf02ae8750" license "GPL-2.0-or-later" head "https://github.com/s3fs-fuse/s3fs-fuse.git" diff --git a/Formula/simple-mtpfs-mac.rb b/Formula/simple-mtpfs-mac.rb index df4afa2..c555e66 100644 --- a/Formula/simple-mtpfs-mac.rb +++ b/Formula/simple-mtpfs-mac.rb @@ -3,7 +3,7 @@ require_relative "../require/macfuse" class SimpleMtpfsMac < Formula desc "Simple MTP fuse filesystem driver" homepage "https://github.com/phatina/simple-mtpfs" - url "https://github.com/phatina/simple-mtpfs/archive/v0.4.0.tar.gz" + url "https://github.com/phatina/simple-mtpfs/archive/refs/tags/v0.4.0.tar.gz" sha256 "1d011df3fa09ad0a5c09d48d84c03e6cddf86390af9eb4e0c178193f32f0e2fc" license "GPL-2.0-or-later" diff --git a/Formula/tup-mac.rb b/Formula/tup-mac.rb index a9f0925..1ccff99 100644 --- a/Formula/tup-mac.rb +++ b/Formula/tup-mac.rb @@ -3,7 +3,7 @@ require_relative "../require/macfuse" class TupMac < Formula desc "File-based build system" homepage "http://gittup.org/tup/" - url "https://github.com/gittup/tup/archive/v0.7.11.tar.gz" + url "https://github.com/gittup/tup/archive/refs/tags/v0.7.11.tar.gz" sha256 "be24dff5f1f32cc85c73398487a756b4a393adab5e4d8500fd5164909d3e85b9" license "GPL-2.0-only" head "https://github.com/gittup/tup.git" diff --git a/README.md b/README.md index 158da9e..6bb8c09 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,9 @@ Homebrew dropped support for macOS Mojave as of 25 Oct 2021. I'll continue to bu First, if you've already installed FUSE formulae from the core tap _before_ they were disabled, you might _not_ want to switch over to my formulae, because: 1. As far as I know, Homebrew will not remove them from your system, even after the formulae themselves are deleted. -2. Many of these formulae are rather old, so you're unlikely to find updates anyway. +2. Many of these formulae are rather old, so you're unlikely to find updates anyway. -But if you _do_ want to install my formulae over the core ones, you should uninstall the latter first: -``` -brew uninstall XYZ -brew install gromgit/fuse/XYZ-mac -``` -Note the `-mac` suffix to the formula name. +But if you _do_ want to install my formulae over the core ones, you should uninstall the latter first. ## Documentation diff --git a/lib/funcs.sh b/lib/funcs.sh index 5d72e06..5632be7 100644 --- a/lib/funcs.sh +++ b/lib/funcs.sh @@ -1,5 +1,6 @@ # string formatters -if [[ -t 1 ]]; then +if [[ -t 1 ]] +then Tty_escape() { printf "\033[%sm" "$1"; } else Tty_escape() { :; } @@ -46,10 +47,12 @@ info() { need_progs() { local missing=() local i - for i in "$@"; do - type -P "$i" &>/dev/null || missing+=("$i") + for i in "$@" + do + type -P "${i}" &>/dev/null || missing+=("${i}") done - if [[ ${#missing[@]} -gt 0 ]]; then + if [[ ${#missing[@]} -gt 0 ]] + then fatal "Commands missing: ${missing[*]}" exit 1 fi @@ -65,8 +68,9 @@ cmd() { # git_in: Run Git command in repo # USAGE: git_in ... git_in() { - local repo=$1; shift - pushd "$repo" >/dev/null || fatal "Can't cd to '$repo'" + local repo=$1 + shift + pushd "${repo}" >/dev/null || fatal "Can't cd to '${repo}'" cmd git "$@" - popd >/dev/null + popd >/dev/null || exit }