From d22b36dc855481efa966ce22b2ab05b2ad3eeadc Mon Sep 17 00:00:00 2001 From: Adrian Ho Date: Tue, 27 Apr 2021 14:25:56 +0800 Subject: [PATCH] mass rename to avoid clashes with core tap Forgot that base formula names need to be unique, otherwise `brew upgrade` picks up the core tap formula over this replacement, leading to: ``` $ brew upgrade [...] ==> Upgrading sshfs 2.10_2 -> 3.7.1 Error: sshfs has been disabled because it requires FUSE! ``` --- Formula/{afuse.rb => afuse-mac.rb} | 4 ++-- Formula/{alluxio.rb => alluxio-mac.rb} | 2 +- Formula/{archivemount.rb => archivemount-mac.rb} | 4 ++-- Formula/{avfs.rb => avfs-mac.rb} | 4 ++-- Formula/{bindfs.rb => bindfs-mac.rb} | 4 ++-- Formula/{curlftpfs.rb => curlftpfs-mac.rb} | 4 ++-- Formula/{dislocker.rb => dislocker-mac.rb} | 4 ++-- Formula/{encfs.rb => encfs-mac.rb} | 4 ++-- Formula/{ext4fuse.rb => ext4fuse-mac.rb} | 4 ++-- Formula/{fuse-zip.rb => fuse-zip-mac.rb} | 4 ++-- formula_renames.json | 11 +++++++++++ 11 files changed, 30 insertions(+), 19 deletions(-) rename Formula/{afuse.rb => afuse-mac.rb} (94%) rename Formula/{alluxio.rb => alluxio-mac.rb} (98%) rename Formula/{archivemount.rb => archivemount-mac.rb} (94%) rename Formula/{avfs.rb => avfs-mac.rb} (95%) rename Formula/{bindfs.rb => bindfs-mac.rb} (95%) rename Formula/{curlftpfs.rb => curlftpfs-mac.rb} (95%) rename Formula/{dislocker.rb => dislocker-mac.rb} (96%) rename Formula/{encfs.rb => encfs-mac.rb} (96%) rename Formula/{ext4fuse.rb => ext4fuse-mac.rb} (94%) rename Formula/{fuse-zip.rb => fuse-zip-mac.rb} (94%) diff --git a/Formula/afuse.rb b/Formula/afuse-mac.rb similarity index 94% rename from Formula/afuse.rb rename to Formula/afuse-mac.rb index 9a749c9..3768bf6 100644 --- a/Formula/afuse.rb +++ b/Formula/afuse-mac.rb @@ -1,6 +1,6 @@ require_relative "../require/macfuse" -class Afuse < Formula +class AfuseMacMac < Formula desc "Automounting file system implemented in userspace with FUSE" homepage "https://github.com/pcarrier/afuse/" url "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/afuse/afuse-0.4.1.tar.gz" @@ -8,7 +8,7 @@ class Afuse < Formula license "GPL-2.0-only" bottle do - root_url "https://github.com/gromgit/homebrew-fuse/releases/download/afuse-0.4.1" + root_url "https://github.com/gromgit/homebrew-fuse/releases/download/afuse-mac-mac-0.4.1" sha256 cellar: :any, big_sur: "5793a602add435689cfcd384bd1e7627568765c2417a30014525eb0e40e71ef5" sha256 cellar: :any, catalina: "2e3018f85263dffcd6ef7e906453ba274601219461bcda3c79d105465f55a175" sha256 cellar: :any, mojave: "d98cbc816c74cdb8c7423234b9542600cb5aa29581608e98ba34c9cbf4db7b86" diff --git a/Formula/alluxio.rb b/Formula/alluxio-mac.rb similarity index 98% rename from Formula/alluxio.rb rename to Formula/alluxio-mac.rb index d9df108..6a16734 100644 --- a/Formula/alluxio.rb +++ b/Formula/alluxio-mac.rb @@ -1,6 +1,6 @@ require_relative "../require/macfuse" -class Alluxio < Formula +class AlluxioMac < Formula desc "Open Source Memory Speed Virtual Distributed Storage" homepage "https://www.alluxio.io/" url "https://downloads.alluxio.io/downloads/files/2.5.0-2/alluxio-2.5.0-2-bin.tar.gz" diff --git a/Formula/archivemount.rb b/Formula/archivemount-mac.rb similarity index 94% rename from Formula/archivemount.rb rename to Formula/archivemount-mac.rb index a21e432..a84b999 100644 --- a/Formula/archivemount.rb +++ b/Formula/archivemount-mac.rb @@ -1,13 +1,13 @@ require_relative "../require/macfuse" -class Archivemount < Formula +class ArchivemountMac < Formula desc "File system for accessing archives using libarchive" homepage "https://www.cybernoia.de/software/archivemount.html" url "https://www.cybernoia.de/software/archivemount/archivemount-0.9.1.tar.gz" sha256 "c529b981cacb19541b48ddafdafb2ede47a40fcaf16c677c1e2cd198b159c5b3" bottle do - root_url "https://github.com/gromgit/homebrew-fuse/releases/download/archivemount-0.9.1" + root_url "https://github.com/gromgit/homebrew-fuse/releases/download/archivemount-mac-0.9.1" sha256 cellar: :any, big_sur: "c6f48f507e80e6b0686bcf675e875046f66580b5d940171e4fa0a3eb9c9db563" sha256 cellar: :any, catalina: "b0b8165a5e48a06374be4bdeeec67bdbf0f0181132af6679ccdc8451c2de55f5" sha256 cellar: :any, mojave: "b7d12374987608fe9e1bc96d8e61de5de960d750ae0bdcb6d7f6e6191cc26d35" diff --git a/Formula/avfs.rb b/Formula/avfs-mac.rb similarity index 95% rename from Formula/avfs.rb rename to Formula/avfs-mac.rb index d63a4aa..3d4e093 100644 --- a/Formula/avfs.rb +++ b/Formula/avfs-mac.rb @@ -1,13 +1,13 @@ require_relative "../require/macfuse" -class Avfs < Formula +class AvfsMac < Formula desc "Virtual file system that facilitates looking inside archives" homepage "https://avf.sourceforge.io/" url "https://downloads.sourceforge.net/project/avf/avfs/1.1.4/avfs-1.1.4.tar.bz2" sha256 "3a7981af8557f864ae10d4b204c29969588fdb526e117456e8efd54bf8faa12b" bottle do - root_url "https://github.com/gromgit/homebrew-fuse/releases/download/avfs-1.1.4" + root_url "https://github.com/gromgit/homebrew-fuse/releases/download/avfs-mac-1.1.4" sha256 big_sur: "330fbd827479a4f6f0e5f218a5b711f2693bbfd92f17735fd5057100205abaca" sha256 catalina: "bcce73a08b09330cf8814b03f5fe5836e46c823c33d07829fba0f865b7fda35e" sha256 mojave: "b10aca4aedca598335f6bc8e20c349559761a485a4bdfcc2bbcd56158b663dc5" diff --git a/Formula/bindfs.rb b/Formula/bindfs-mac.rb similarity index 95% rename from Formula/bindfs.rb rename to Formula/bindfs-mac.rb index 4a923d1..14d1175 100644 --- a/Formula/bindfs.rb +++ b/Formula/bindfs-mac.rb @@ -1,6 +1,6 @@ require_relative "../require/macfuse" -class Bindfs < Formula +class BindfsMac < Formula desc "FUSE file system for mounting to another location" homepage "https://bindfs.org/" url "https://bindfs.org/downloads/bindfs-1.15.1.tar.gz" @@ -8,7 +8,7 @@ class Bindfs < Formula license "GPL-2.0-or-later" bottle do - root_url "https://github.com/gromgit/homebrew-fuse/releases/download/bindfs-1.15.1" + root_url "https://github.com/gromgit/homebrew-fuse/releases/download/bindfs-mac-1.15.1" sha256 cellar: :any, big_sur: "f940f18270f1319c5f27c755538949c87a3d282ab0cf2c7397067c3df67c6306" sha256 cellar: :any, catalina: "3d2d4117dc51e3c77a23baa2c35edefc3a2d184eb41ad8656840a7a43922ed07" sha256 cellar: :any, mojave: "e7fcdd329d514eff00daad7f368dd31c01aafb6c305237f167ea99d710dee73d" diff --git a/Formula/curlftpfs.rb b/Formula/curlftpfs-mac.rb similarity index 95% rename from Formula/curlftpfs.rb rename to Formula/curlftpfs-mac.rb index 261568d..c9ab5f3 100644 --- a/Formula/curlftpfs.rb +++ b/Formula/curlftpfs-mac.rb @@ -1,6 +1,6 @@ require_relative "../require/macfuse" -class Curlftpfs < Formula +class CurlftpfsMac < Formula desc "Filesystem for accessing FTP hosts based on FUSE and libcurl" homepage "https://curlftpfs.sourceforge.io/" url "https://downloads.sourceforge.net/project/curlftpfs/curlftpfs/0.9.2/curlftpfs-0.9.2.tar.gz" @@ -8,7 +8,7 @@ class Curlftpfs < Formula head ":pserver:anonymous:@curlftpfs.cvs.sourceforge.net:/cvsroot/curlftpfs", using: :cvs bottle do - root_url "https://github.com/gromgit/homebrew-fuse/releases/download/curlftpfs-0.9.2" + root_url "https://github.com/gromgit/homebrew-fuse/releases/download/curlftpfs-mac-0.9.2" sha256 cellar: :any, big_sur: "8d2060b8190ac5bb9ced1aebb2ff8c978a2a48e87ab2e1442f1dd6c4c5cc41c9" sha256 cellar: :any, catalina: "30938fb4225dfd85415d9fafdf7e3d9b220583bdbd9bfbc189de1018ca4b2cb6" sha256 cellar: :any, mojave: "c4dc618a80e0edde991318b3eecfcda775fff86307f059355a2695000cd8f35d" diff --git a/Formula/dislocker.rb b/Formula/dislocker-mac.rb similarity index 96% rename from Formula/dislocker.rb rename to Formula/dislocker-mac.rb index e758616..1f6f406 100644 --- a/Formula/dislocker.rb +++ b/Formula/dislocker-mac.rb @@ -1,6 +1,6 @@ require_relative "../require/macfuse" -class Dislocker < Formula +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" @@ -8,7 +8,7 @@ class Dislocker < Formula license "GPL-2.0-or-later" bottle do - root_url "https://github.com/gromgit/homebrew-fuse/releases/download/dislocker-0.7.3" + root_url "https://github.com/gromgit/homebrew-fuse/releases/download/dislocker-mac-0.7.3" sha256 big_sur: "ad648b9de0d695bb5aa316a2a68110f5d9181f050f1efe49d4f0df4bfc531eb1" sha256 catalina: "a3dbcd27de799127c8046037cd8c287de5d3fd1c69f4f27966566eb6bb329782" sha256 mojave: "bde6ccac5ddd2d8c4686df516c0d5145d27ecc8e4d4a63eef51b7f9b4d8941ae" diff --git a/Formula/encfs.rb b/Formula/encfs-mac.rb similarity index 96% rename from Formula/encfs.rb rename to Formula/encfs-mac.rb index 63ae24e..e4a603d 100644 --- a/Formula/encfs.rb +++ b/Formula/encfs-mac.rb @@ -1,6 +1,6 @@ require_relative "../require/macfuse" -class Encfs < Formula +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" @@ -11,7 +11,7 @@ class Encfs < Formula head "https://github.com/vgough/encfs.git" bottle do - root_url "https://github.com/gromgit/homebrew-fuse/releases/download/encfs-1.9.5" + root_url "https://github.com/gromgit/homebrew-fuse/releases/download/encfs-mac-1.9.5" sha256 big_sur: "a3ad5e221f05f624c74ff3015164ae6e2bac3a99537b3b0a9d8f0b546130abe7" sha256 catalina: "41efd14389d04bf5d2a0bc957972b15b6e1ff511452c89749ddc68b6bca6e3e7" sha256 mojave: "aaf2aa568786ed055114cf54ee4b46acd66f74a7bc10715b446198164afa1871" diff --git a/Formula/ext4fuse.rb b/Formula/ext4fuse-mac.rb similarity index 94% rename from Formula/ext4fuse.rb rename to Formula/ext4fuse-mac.rb index 5220fc2..7d6cbed 100644 --- a/Formula/ext4fuse.rb +++ b/Formula/ext4fuse-mac.rb @@ -1,6 +1,6 @@ require_relative "../require/macfuse" -class Ext4fuse < Formula +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" @@ -9,7 +9,7 @@ class Ext4fuse < Formula head "https://github.com/gerard/ext4fuse.git" bottle do - root_url "https://github.com/gromgit/homebrew-fuse/releases/download/ext4fuse-0.1.3" + root_url "https://github.com/gromgit/homebrew-fuse/releases/download/ext4fuse-mac-0.1.3" sha256 cellar: :any, big_sur: "e29a46d11968d75fd09e06ff1d0c1be7bf63f11e56ed3c4eacbfb223f0ad5d5d" sha256 cellar: :any, catalina: "37c3b8fe51092e5b7053b1f12313b57baf7ba6afbc0c5069cad41bc834127dd9" sha256 cellar: :any, mojave: "3c4c0f771fb91a2c229dfd2f475e6fe1cc575a3c511893fc267d5ae8bb1df9a7" diff --git a/Formula/fuse-zip.rb b/Formula/fuse-zip-mac.rb similarity index 94% rename from Formula/fuse-zip.rb rename to Formula/fuse-zip-mac.rb index 1886b17..e019ad7 100644 --- a/Formula/fuse-zip.rb +++ b/Formula/fuse-zip-mac.rb @@ -1,6 +1,6 @@ require_relative "../require/macfuse" -class FuseZip < Formula +class FuseZipMac < Formula desc "FUSE file system to create & manipulate ZIP archives" homepage "https://bitbucket.org/agalanin/fuse-zip" url "https://bitbucket.org/agalanin/fuse-zip/get/0.7.2.tar.gz" @@ -9,7 +9,7 @@ class FuseZip < Formula head "https://bitbucket.org/agalanin/fuse-zip", using: :hg bottle do - root_url "https://github.com/gromgit/homebrew-fuse/releases/download/fuse-zip-0.7.2" + root_url "https://github.com/gromgit/homebrew-fuse/releases/download/fuse-zip-mac-0.7.2" sha256 cellar: :any, big_sur: "4e7bbaf05a17ccf3282e6a15cdbe7e46b66e3f6ebe269b3600a05a8c3cf9571a" sha256 cellar: :any, catalina: "bed4d00e3b56d18a4ebb7a76bcc9e1f6b4f7e0492b6956275285f8a0d5a3391c" sha256 cellar: :any, mojave: "1641e4fed95580af8f2146bf3b9e03b8197b016793d8ecaa9defbb6f00c66e62" diff --git a/formula_renames.json b/formula_renames.json index c545424..021d7cc 100644 --- a/formula_renames.json +++ b/formula_renames.json @@ -1,3 +1,14 @@ { + "afuse": "afuse-mac", + "afuse-mac": "afuse-mac-mac", + "alluxio": "alluxio-mac", + "archivemount": "archivemount-mac", + "avfs": "avfs-mac", + "bindfs": "bindfs-mac", + "curlftpfs": "curlftpfs-mac", + "dislocker": "dislocker-mac", + "encfs": "encfs-mac", + "ext4fuse": "ext4fuse-mac", + "fuse-zip": "fuse-zip-mac", "gcsfuse": "gcsfuse-mac" }