570729f22147584016ca02e0b979f7b40f9659c5

Author
Paul Rudkin <paul@rudkin.me.uk>
Committer
GitHub <noreply@github.com>
Date

Message

forklift: add support for Forklift distributed via the Setapp (#8803)

Diff

 1diff --git a/plugins/forklift/forklift.plugin.zsh b/plugins/forklift/forklift.plugin.zsh
 2index 274c4a822ab467b880d8d8dd9c00d26a01861c7e..85889481b938440a9339a7d828e23fe1451e78b3 100644
 3--- a/plugins/forklift/forklift.plugin.zsh
 4+++ b/plugins/forklift/forklift.plugin.zsh
 5@@ -1,6 +1,7 @@
 6 # Open folder in ForkLift.app or ForkLift2.app from console
 7 # Author: Adam Strzelecki nanoant.com, modified by Bodo Tasche bitboxer.de
 8 #         Updated to support ForkLift 2 and ForkLift 3 by Johan Kaving
 9+#         Updated to support ForkLift from Setapp by Paul Rudkin
10 #
11 # Usage:
12 #   fl [<folder>]
13@@ -24,6 +25,13 @@ function fl {
14   fi
15   osascript 2>&1 1>/dev/null <<END
16 
17+  try
18+    tell application "Finder"
19+        set forkLiftSetapp to name of application file id "com.binarynights.forklift-setapp"
20+    end tell
21+  on error err_msg number err_num
22+    set forkLiftSetapp to null
23+  end try
24   try
25     tell application "Finder"
26         set forkLift3 to name of application file id "com.binarynights.ForkLift-3"
27@@ -46,7 +54,12 @@ function fl {
28     set forkLift to null
29   end try
30 
31-  if forkLift3 is not null and application forkLift3 is running then
32+  if forkLiftSetapp is not null and application forkLiftSetapp is running then
33+    tell application forkLiftSetapp
34+        activate
35+        set forkLiftVersion to version
36+    end tell	
37+  else if forkLift3 is not null and application forkLift3 is running then
38     tell application forkLift3
39         activate
40         set forkLiftVersion to version
41@@ -62,7 +75,9 @@ function fl {
42         set forkLiftVersion to version
43     end tell
44   else
45-    if forkLift3 is not null then
46+    if forkLiftSetapp is not null then
47+        set appName to forkLiftSetapp
48+    else if forkLift3 is not null then
49         set appName to forkLift3
50     else if forkLift2 is not null then
51         set appName to forkLift2