Skip to content

Commit 28aec2b

Browse files
committed
fix paths for OSX force install
1 parent f119b83 commit 28aec2b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/arduino_ci/arduino_downloader_osx.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ def self.find_existing_arduino_exe(paths)
4141
# The path to the directory of an existing installation, or nil
4242
# @return [string]
4343
def self.existing_installation
44-
self.find_existing_arduino_dir(["/Applications/Arduino.app/Contents"])
44+
self.find_existing_arduino_dir(["/Applications/Arduino.app"])
4545
end
4646

4747
# The executable Arduino file in an existing installation, or nil
4848
# @return [string]
4949
def self.existing_executable
50-
self.find_existing_arduino_exe(["/Applications/Arduino.app/Contents"])
50+
self.find_existing_arduino_exe(["/Applications/Arduino.app"])
5151
end
5252

5353
# The executable Arduino file in a forced installation, or nil
5454
# @return [string]
5555
def self.force_installed_executable
56-
self.find_existing_arduino_exe([File.join(self.force_install_location, "Contents")])
56+
self.find_existing_arduino_exe([self.force_install_location])
5757
end
5858

5959
end

lib/arduino_ci/arduino_installation.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def autolocate_osx
6060
"processing.app.Base",
6161
],
6262
# failsafe way
63-
[File.join(osx_root, "MacOS", "Arduino")]
63+
[File.join(osx_root, "Contents", "MacOS", "Arduino")]
6464
]
6565

6666
# create return and find a command launcher that works

0 commit comments

Comments
 (0)