rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-18 07:52:14 +01:00
Code Issues Releases Activity

Don't include a path to the avrdude config file on Linux, avrdude will know where it's config file is.

Browse Source
This commit is contained in:
David A. Mellis 2007-07-18 14:55:54 +00:00
parent 1a4dfa9d87
commit 0276117d36
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/AvrdudeUploader.java
View File

@ -120,21 +120,22 @@ public class AvrdudeUploader extends Uploader {
public boolean uisp(Collection params) throws RunnerException {
flushSerialBuffer();
String userdir = System.getProperty("user.dir") + File.separator;
String avrBasePath;
if(Base.isMacOS()) {
avrBasePath = new String("tools/avr/etc/");
}
else if(Base.isLinux()) {
avrBasePath = new String("");
}
else {
avrBasePath = new String(userdir + "tools/avr/etc/");
}
List commandDownloader = new ArrayList();
commandDownloader.add("avrdude");
commandDownloader.add("-C" + avrBasePath + File.separator + "avrdude.conf");
// On Windows and the Mac, we need to point avrdude at its config file
// since it's getting installed in an unexpected location (i.e. a
// sub-directory of wherever the user happens to stick Arduino). On Linux,
// avrdude will have been properly installed by the distribution's package
// manager and should be able to find its config file.
if(Base.isMacOS()) {
commandDownloader.add("-C" + "tools/avr/etc/avrdude.conf");
}
else if(Base.isWindows()) {
String userdir = System.getProperty("user.dir") + File.separator;
commandDownloader.add("-C" + userdir + "tools/avr/etc/avrdude.conf");
}
if (Preferences.getBoolean("upload.verbose")) {
commandDownloader.add("-v");
commandDownloader.add("-v");