Skip to content

Commit e0dfa25

Browse files
damellisdamellis
committed
Updated fetch.sh script to download guide. Pointing menu to correct getting started howto for platform.
1 parent 6bcf40e commit e0dfa25

File tree

4 files changed

+25
-11
lines changed

4 files changed

+25
-11
lines changed

‎app/Editor.java

+21-5
Original file line numberDiff line numberDiff line change
@@ -868,11 +868,27 @@ protected JMenu buildHelpMenu() {
868868
JMenu menu = new JMenu("Help");
869869
JMenuItem item;
870870

871-
item = new JMenuItem("Howto");
871+
if (!Base.isLinux()) {
872+
item = new JMenuItem("Getting Started");
873+
item.addActionListener(new ActionListener() {
874+
public void actionPerformed(ActionEvent e) {
875+
if (Base.isWindows())
876+
Base.openURL(System.getProperty("user.dir") + File.separator +
877+
"reference" + File.separator + "Guide_Windows.html");
878+
else
879+
Base.openURL(System.getProperty("user.dir") + File.separator +
880+
"reference" + File.separator + "Guide_MacOSX.html");
881+
}
882+
});
883+
menu.add(item);
884+
}
885+
886+
item = new JMenuItem("Troubleshooting");
872887
item.addActionListener(new ActionListener() {
873888
public void actionPerformed(ActionEvent e) {
874889
Base.openURL(System.getProperty("user.dir") + File.separator +
875-
"reference" + File.separator + "howto.html");
890+
"reference" + File.separator +
891+
"Guide_Troubleshooting.html");
876892
}
877893
});
878894
menu.add(item);
@@ -881,7 +897,7 @@ public void actionPerformed(ActionEvent e) {
881897
item.addActionListener(new ActionListener() {
882898
public void actionPerformed(ActionEvent e) {
883899
Base.openURL(System.getProperty("user.dir") + File.separator +
884-
"reference" + File.separator + "environment.html");
900+
"reference" + File.separator + "Guide_Environment.html");
885901
}
886902
});
887903
menu.add(item);
@@ -890,7 +906,7 @@ public void actionPerformed(ActionEvent e) {
890906
item.addActionListener(new ActionListener() {
891907
public void actionPerformed(ActionEvent e) {
892908
Base.openURL(System.getProperty("user.dir") + File.separator +
893-
"reference" + File.separator + "index.html");
909+
"reference" + File.separator + "index.html");
894910
}
895911
});
896912
menu.add(item);
@@ -899,7 +915,7 @@ public void actionPerformed(ActionEvent e) {
899915
item.addActionListener(new ActionListener() {
900916
public void actionPerformed(ActionEvent e) {
901917
Base.openURL(System.getProperty("user.dir") + File.separator +
902-
"reference" + File.separator + "FAQ.html");
918+
"reference" + File.separator + "FAQ.html");
903919
}
904920
});
905921
menu.add(item);

‎build/fetch.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,21 @@
77

88
mkdir reference
99
cd reference
10-
curl http://www.arduino.cc/en/Main/Howto -o howto.html
10+
curl http://www.arduino.cc/en/Guide/HomePage -o Guide_index.html
1111
curl http://www.arduino.cc/en/Main/FAQ -o FAQ.html
1212
curl http://arduino.cc/en/Main/Environment -o environment.html
1313
curl http://www.arduino.cc/en/Reference/HomePage -o index.html
1414
curl http://www.arduino.cc/en/pub/skins/arduino/arduino.css -o arduino.css
15+
for i in `grep -o "http://www.arduino.cc/en/Guide/[^']*" Guide_index.html | sort -u | grep -v '?' | cut -d '/' -f 6`; do curl http://www.arduino.cc/en/Guide/$i -o Guide_$i.html; done
1516
for i in `grep -o "http://www.arduino.cc/en/Reference/[^']*" index.html | sort -u | grep -v '?' | cut -d '/' -f 6`; do curl http://www.arduino.cc/en/Reference/$i -o $i.html; done
1617
for i in `grep -o "http://www.arduino.cc/en/Serial/[^']*" index.html | sort -u | grep -v '?' | cut -d '/' -f 6`; do curl http://www.arduino.cc/en/Serial/$i -o Serial_$i.html; done
1718
perl -i -pe "s|http://www.arduino.cc/en/Reference/[^?\"']*\?[^'\"]*|#|g" *.html # replace links to unknown pages with links to '#'
19+
perl -i -pe "s|http://www.arduino.cc/en/Guide/([^']*)|Guide_\1.html|g" *.html # replace links to remote guide with links to local guide
1820
perl -i -pe "s|http://www.arduino.cc/en/Reference/([^']*)|\1.html|g" *.html # replace links to remote reference with links to local reference
1921
perl -i -pe "s|http://www.arduino.cc/en/Serial/([^']*)|Serial_\1.html|g" *.html # replace links to remove serial reference with links to local serial reference
2022
perl -i -pe "s|http://www.arduino.cc/en/pub/skins/arduino/arduino.css|arduino.css|g" *.html
2123
perl -i -pe "s|HomePage.html|index.html|g" *.html
2224
perl -i -pe "s|href=\"/\"|href=\"http://www.arduino.cc/\"|g" *.html
2325
cd ..
2426
zip -r shared/reference.zip reference
25-
rm -rf reference
27+
#rm -rf reference

‎build/macosx/Arduino.xcodeproj/project.pbxproj

-4
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,6 @@
458458
33FF02960965BD160016AC38 /* makefile.w2k */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = makefile.w2k; sourceTree = "<group>"; };
459459
33FF02970965BD160016AC38 /* makefile.win */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = makefile.win; sourceTree = "<group>"; };
460460
33FF02990965BD160016AC38 /* FTDI USB Drivers.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = "FTDI USB Drivers.zip"; sourceTree = "<group>"; };
461-
33FF029A0965BD160016AC38 /* KeyspanUSA19wWinV31.exe */ = {isa = PBXFileReference; lastKnownFileType = file; path = KeyspanUSA19wWinV31.exe; sourceTree = "<group>"; };
462461
33FF029B0965BD160016AC38 /* ICE_JNIRegistry.dll */ = {isa = PBXFileReference; lastKnownFileType = file; path = ICE_JNIRegistry.dll; sourceTree = "<group>"; };
463462
33FF029C0965BD160016AC38 /* jikes.exe */ = {isa = PBXFileReference; lastKnownFileType = file; path = jikes.exe; sourceTree = "<group>"; };
464463
33FF029E0965BD170016AC38 /* makefile.w2k */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = makefile.w2k; sourceTree = "<group>"; };
@@ -576,7 +575,6 @@
576575
33FFFE930965BD110016AC38 /* .cvsignore */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = .cvsignore; sourceTree = "<group>"; };
577576
33FFFE940965BD110016AC38 /* Arduino.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = Arduino.xcodeproj; sourceTree = "<group>"; };
578577
33FFFEAF0965BD110016AC38 /* burn.command */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = burn.command; sourceTree = "<group>"; };
579-
33FFFEB40965BD110016AC38 /* KeyspanUSAdrvr20.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = KeyspanUSAdrvr20.dmg; sourceTree = "<group>"; };
580578
33FFFEB50965BD110016AC38 /* DS_Store */ = {isa = PBXFileReference; lastKnownFileType = file; path = DS_Store; sourceTree = "<group>"; };
581579
33FFFEB60965BD110016AC38 /* jikes */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = jikes; sourceTree = "<group>"; };
582580
33FFFEB90965BD110016AC38 /* macosx_setup.command */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = macosx_setup.command; sourceTree = "<group>"; };
@@ -720,7 +718,6 @@
720718
isa = PBXGroup;
721719
children = (
722720
33FF02990965BD160016AC38 /* FTDI USB Drivers.zip */,
723-
33FF029A0965BD160016AC38 /* KeyspanUSA19wWinV31.exe */,
724721
);
725722
path = drivers;
726723
sourceTree = "<group>";
@@ -1014,7 +1011,6 @@
10141011
children = (
10151012
338C47870AA204B0008F2C0D /* FTDIUSBSerialDriver_v2_1_6.dmg */,
10161013
338C47880AA204B0008F2C0D /* FTDIUSBSerialDriver_v2_2_6_Intel.dmg */,
1017-
33FFFEB40965BD110016AC38 /* KeyspanUSAdrvr20.dmg */,
10181014
);
10191015
path = drivers;
10201016
sourceTree = "<group>";

‎build/shared/reference.zip

27 KB
Binary file not shown.

0 commit comments

Comments
 (0)