phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-11-06 04:40:07 +01:00
Code Releases Activity

👌 Check for /usr/local/homebrew directory (#251)

Browse Source 
For this to work, Homebrew cannot be installed in /usr/local, which
means that the /usr/local/Cellar folder will be missing and the folder
/usr/local/homebrew will exist.
This commit is contained in:
Nico Verbruggen
2023-05-17 12:07:20 +02:00
parent c4749673c9
commit a8cf6daa94
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
phpmon/Common/Core/Paths.swift
View File

@@ -19,7 +19,17 @@ public class Paths {
private var userName: String private var userName: String
init() { init() {
// Assume the default directory is correct
baseDir = App.architecture != "x86_64" ? .opt : .usr baseDir = App.architecture != "x86_64" ? .opt : .usr
// Ensure that if a different location is used, it takes precendence
if baseDir == .usr
&& FileSystem.directoryExists("/usr/local/homebrew")
&& !FileSystem.directoryExists("/usr/local/Cellar") {
Log.warn("Using /usr/local/homebrew as base directory!")
baseDir = .usr_hb
}
userName = identity() userName = identity()
Log.info("The current username is `\(userName)`.") Log.info("The current username is `\(userName)`.")
} }
@@ -100,6 +110,8 @@ public class Paths {
Paths.composer = "/usr/local/bin/composer" Paths.composer = "/usr/local/bin/composer"
} else if FileSystem.fileExists("/opt/homebrew/bin/composer") { } else if FileSystem.fileExists("/opt/homebrew/bin/composer") {
Paths.composer = "/opt/homebrew/bin/composer" Paths.composer = "/opt/homebrew/bin/composer"
} else if FileSystem.fileExists("/usr/local/homebrew/bin/composer") {
Paths.composer = "/usr/local/homebrew/bin/composer"
} else { } else {
Paths.composer = nil Paths.composer = nil
Log.warn("Composer was not found.") Log.warn("Composer was not found.")
@@ -111,6 +123,7 @@ public class Paths {
public enum HomebrewDir: String { public enum HomebrewDir: String {
case opt = "/opt/homebrew" case opt = "/opt/homebrew"
case usr = "/usr/local" case usr = "/usr/local"
case usr_hb = "/usr/local/homebrew"
} }
} }