Skip to content

Fix sketchybar invocation to work with non-Homebrew installs #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
klockeph wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix sketchybar invocation to work with non-Homebrew installs #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions Sources/SketchyBarToggleCore/PrerequisiteChecker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,7 @@ public struct PrerequisiteReport {
}

public final class PrerequisiteChecker {
private let sketchybarPath: String

public init() {
if FileManager.default.fileExists(atPath: "/opt/homebrew/bin/sketchybar") {
sketchybarPath = "/opt/homebrew/bin/sketchybar"
} else if FileManager.default.fileExists(atPath: "/usr/local/bin/sketchybar") {
sketchybarPath = "/usr/local/bin/sketchybar"
} else {
sketchybarPath = "sketchybar"
}
}
public init() {}

public func check() -> PrerequisiteReport {
var issues: [String] = []
Expand Down Expand Up @@ -95,8 +85,8 @@ public final class PrerequisiteChecker {

private func querySketchyBar() -> (running: Bool, topmost: String?) {
let process = Process()
process.executableURL = URL(fileURLWithPath: sketchybarPath)
process.arguments = ["--query", "bar"]
process.executableURL = URL(fileURLWithPath: "/usr/bin/env")
process.arguments = ["sketchybar", "--query", "bar"]

let pipe = Pipe()
process.standardOutput = pipe
Expand Down
20 changes: 5 additions & 15 deletions Sources/SketchyBarToggleCore/SketchyBarController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,7 @@ import Foundation

/// Controls SketchyBar visibility by shelling out to the `sketchybar` CLI.
public final class SketchyBarController: BarController {
private let sketchybarPath: String

public init() {
if FileManager.default.fileExists(atPath: "/opt/homebrew/bin/sketchybar") {
sketchybarPath = "/opt/homebrew/bin/sketchybar"
} else if FileManager.default.fileExists(atPath: "/usr/local/bin/sketchybar") {
sketchybarPath = "/usr/local/bin/sketchybar"
} else {
sketchybarPath = "sketchybar"
}
}
public init() {}

public func hide() {
// Instant hide — macOS menu bar is already sliding in
Expand All @@ -27,8 +17,8 @@ public final class SketchyBarController: BarController {

private func run(arguments: [String]) {
let process = Process()
process.executableURL = URL(fileURLWithPath: sketchybarPath)
process.arguments = arguments
process.executableURL = URL(fileURLWithPath: "/usr/bin/env")
process.arguments = ["sketchybar"] + arguments
process.standardOutput = FileHandle.nullDevice
process.standardError = FileHandle.nullDevice

Expand All @@ -42,8 +32,8 @@ public final class SketchyBarController: BarController {

private func runAsync(arguments: [String]) {
let process = Process()
process.executableURL = URL(fileURLWithPath: sketchybarPath)
process.arguments = arguments
process.executableURL = URL(fileURLWithPath: "/usr/bin/env")
process.arguments = ["sketchybar"] + arguments
process.standardOutput = FileHandle.nullDevice
process.standardError = FileHandle.nullDevice

Expand Down