phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-08 04:20:07 +02:00
Code Releases Activity

🔀 Merge branch 'dev/4.x'

Browse Source
This commit is contained in:
Nico Verbruggen
2022-01-27 00:45:21 +01:00
parent 1566323fca ef469868d8
commit a2f6c70a03
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PHP Monitor.xcodeproj/project.pbxproj
View File

@ -831,7 +831,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 137; CURRENT_PROJECT_VERSION = 140;
DEVELOPMENT_TEAM = 8M54J5J787; DEVELOPMENT_TEAM = 8M54J5J787;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = phpmon/Info.plist; INFOPLIST_FILE = phpmon/Info.plist;
@ -840,7 +840,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 11.0; MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 4.1.2; MARKETING_VERSION = 4.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@ -856,7 +856,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 137; CURRENT_PROJECT_VERSION = 140;
DEVELOPMENT_TEAM = 8M54J5J787; DEVELOPMENT_TEAM = 8M54J5J787;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = phpmon/Info.plist; INFOPLIST_FILE = phpmon/Info.plist;
@ -865,7 +865,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 11.0; MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 4.1.2; MARKETING_VERSION = 4.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

4
README.md
View File

@ -251,9 +251,7 @@ To see which files are checked to determine availability, see [this file](./phpm
<details> <details>
<summary><strong>After running PHP Monitor, Homebrew sometimes has issues with `brew upgrade` or `brew cleanup`!</strong></summary> <summary><strong>After running PHP Monitor, Homebrew sometimes has issues with `brew upgrade` or `brew cleanup`!</strong></summary>
<strike>This is a security feature of Homebrew. When you start a service as an administrator, the root user becomes the owner of relevant binaries. You will need to manually clean up those folders yourself using `rm -rf` (or by manually removing those folders via Finder).</strike> This is a security feature of Homebrew. When you start a service as an administrator, the root user becomes the owner of relevant binaries. You will need to manually clean up those folders yourself using `rm -rf` (or by manually removing those folders via Finder).
**Update**: If you are using the Valet switcher (currently not available in the latest stable build) you will not encounter this issue. For more information on this, see [this issue](https://github.com/nicoverbruggen/phpmon/issues/17) and also [this issue about switching to Valet's switcher](https://github.com/nicoverbruggen/phpmon/issues/34).
</details> </details>

3
phpmon/Domain/Terminal/Paths.swift
View File

@ -16,6 +16,7 @@ class Paths {
static let shared = Paths() static let shared = Paths()
var baseDir : HomebrewDir var baseDir : HomebrewDir
var userName = String(Shell.pipe("whoami").split(separator: "\n")[0])
init() { init() {
let optBrewFound = Shell.fileExists("\(HomebrewDir.opt.rawValue)/bin/brew") let optBrewFound = Shell.fileExists("\(HomebrewDir.opt.rawValue)/bin/brew")
@ -56,7 +57,7 @@ class Paths {
// - MARK: Paths // - MARK: Paths
public static var whoami: String { public static var whoami: String {
return String(Shell.pipe("whoami").split(separator: "\n")[0]) return shared.userName
} }
public static var binPath: String { public static var binPath: String {

2
phpmon/Domain/Terminal/Shell.swift
View File

@ -91,7 +91,7 @@ class Shell {
: command : command
task.launchPath = self.shell task.launchPath = self.shell
task.arguments = ["--login", "-c", tailoredCommand] task.arguments = ["--noprofile", "-norc", "--login", "-c", tailoredCommand]
task.standardOutput = outputPipe task.standardOutput = outputPipe
task.standardError = errorPipe task.standardError = errorPipe
task.launch() task.launch()

2
phpmon/Localizable.strings
View File

@ -100,7 +100,7 @@
"prefs.dynamic_icon_title" = "Display dynamic icon in menu bar"; "prefs.dynamic_icon_title" = "Display dynamic icon in menu bar";
"prefs.dynamic_icon_desc" = "If you uncheck this box, the truck icon will always be visible.\nIf checked, it will display the major version number of the\ncurrently linked PHP version."; "prefs.dynamic_icon_desc" = "If you uncheck this box, the truck icon will always be visible.\nIf checked, it will display the major version number of the\ncurrently linked PHP version.";
"prefs.display_full_php_version" = "Display full PHP version in menu bar"; "prefs.display_full_php_version" = "Display full PHP version in menu bar and dropdown";
"prefs.display_full_php_version_desc" = "Display the full version instead of the major version only.\n(This may be undesirable on smaller displays,\nso this is disabled by default.)"; "prefs.display_full_php_version_desc" = "Display the full version instead of the major version only.\n(This may be undesirable on smaller displays,\nso this is disabled by default.)";
"prefs.use_internal_switcher" = "Use PHP Monitor’s own version switcher"; "prefs.use_internal_switcher" = "Use PHP Monitor’s own version switcher";