Skip to content

Commit da8211c

Browse files
committed
fix library paths
1 parent 6eaa473 commit da8211c

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

lib/arduino_ci/arduino_cmd.rb

+2-3
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,13 @@ def verify_sketch(path)
203203
# ensure that the given library is installed, or symlinked as appropriate
204204
# return the path of the prepared library, or nil
205205
def install_local_library(library_path)
206-
sketchbook = get_pref("sketchbook.path")
207206
library_name = File.basename(library_path)
208-
destination_path = File.join(sketchbook, library_name)
207+
destination_path = File.join(@installation.lib_dir, library_name)
209208

210209
# things get weird if the sketchbook contains the library.
211210
# check that first
212211
if File.exist? destination_path
213-
uhoh = "There is already a library '#{library_name}' in the sketchbook"
212+
uhoh = "There is already a library '#{library_name}' in the library directory"
214213
return destination_path if destination_path == library_path
215214

216215
# maybe it's a symlink? that would be OK

lib/arduino_ci/arduino_installation.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def autolocate
5555
"processing.app.Base",
5656
]
5757
end
58-
ret.lib_dir = File.join(osx_place, "Libraries")
58+
ret.lib_dir = File.join(osx_place, "Libraries") # TODO: probably wrong
5959
ret.requires_x = false
6060
return ret
6161
end

0 commit comments

Comments
 (0)