Skip to content

Commit 608baf9

Browse files
committed
Distinguish between force-installed and existing Arduino installs
1 parent 9d7d96f commit 608baf9

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

lib/arduino_ci/arduino_installation.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,14 @@ def autolocate_linux
5555
gui_place = Host.which(gui_name)
5656
unless gui_place.nil?
5757
ret = ArduinoCmdLinux.new
58-
forced_arduino = File.join(force_install_location, gui_name)
59-
forced = File.exist?(forced_arduino)
60-
ret.base_cmd = [(forced ? forced_arduino : gui_place)]
58+
ret.base_cmd = [gui_place]
59+
return ret
60+
end
61+
62+
forced_arduino = File.join(force_install_location, gui_name)
63+
if File.exist?(forced_arduino)
64+
ret = ArduinoCmdLinux.new
65+
ret.base_cmd = [forced_arduino]
6166
return ret
6267
end
6368
nil

0 commit comments

Comments
 (0)