- cleared out a few more install/uninstall bugs

- also fixed extras zipfiles to have proper paths

Author: g2e

Diff for: Contents.m

@@ -1,5 +1,5 @@
 % SEIZMO - Passive Seismology Toolbox
-% Version 0.6.15 Noshaq 25-Feb-2014
+% Version 0.6.15 Noshaq 2-Mar-2014
 %
 % New to SEIZMO? Overwhelmed by all the functions?
 %  <a href="matlab:showdemo sz_pub_beginning">THE BASICS</a>

Diff for: docs/seizmo_to_do.txt

@@ -49,7 +49,7 @@ download_extras.bash
         - add new 3D models?
             - sph harm mantle models
                 - really need codes to synthesize info at points
-                    - fjsimmons has matlab codes along these lines it seems
+                    - fjsimmons might have matlab codes along these lines
             - ani mantle models
                 - just store the values as another field
                 - add an ani flag of some sort (should indicate type too)

Diff for: shutdown_seizmo.m

@@ -72,21 +72,21 @@
 end
 
 % removing irisws jar
-jars(1)=[path fs 'ws' fs 'IRIS-WS-2.0.6.jar'];
+jars{1}=[path fs 'ws' fs 'IRIS-WS-2.0.6.jar'];
 for i=1:numel(jars)
-    if(java_in_octave && ismember(jars(1),javaclasspath))
-        javarmpath(jars(1));
+    if(java_in_octave && ismember(jars{1},javaclasspath))
+        javarmpath(jars{1});
     end
 end
 clear jars;
 
 % removing the jars for mattaup
-jars(1)=[path fs 'mattaup' fs 'lib' fs 'TauP-2.1.1.jar'];
-jars(2)=[path fs 'mattaup' fs 'lib' fs 'seisFile-1.5.1.jar'];
-jars(3)=[path fs 'mattaup' fs 'lib' fs 'MatTauP-2.1.1.jar'];
+jars{1}=[path fs 'mattaup' fs 'lib' fs 'TauP-2.1.1.jar'];
+jars{2}=[path fs 'mattaup' fs 'lib' fs 'seisFile-1.5.1.jar'];
+jars{3}=[path fs 'mattaup' fs 'lib' fs 'MatTauP-2.1.1.jar'];
 for i=1:numel(jars)
-    if(java_in_octave && ismember(jars(i),javaclasspath))
-        javarmpath(jars(i));
+    if(java_in_octave && ismember(jars{i},javaclasspath))
+        javarmpath(jars{i});
     end
 end
 clear jars;
@@ -114,11 +114,11 @@
 
 % jars (2 of them) for external program njtbx
 % - used by WW3 functions (analyze ocean waves & seismic noise)
-jars(1)=[path fs 'njtbx' fs 'njTools-2.0.12_jre1.6.jar'];
-jars(2)=[path fs 'njtbx' fs 'toolsUI-4.0.49.jar'];
+jars{1}=[path fs 'njtbx' fs 'njTools-2.0.12_jre1.6.jar'];
+jars{2}=[path fs 'njtbx' fs 'toolsUI-4.0.49.jar'];
 for i=1:numel(jars)
-    if(java_in_octave && ismember(jars(i),javaclasspath))
-        javarmpath(jars(i));
+    if(java_in_octave && ismember(jars{i},javaclasspath))
+        javarmpath(jars{i});
     end
 end
 clear jars;

Diff for: startup_seizmo.m

@@ -71,23 +71,27 @@
 end
 
 % adding irisws jar
-jars(1)=[path fs 'ws' fs 'IRIS-WS-2.0.6.jar'];
+jars{1}='IRIS-WS-2.0.6.jar';
+pjars=strcat(path,fs,'ws',fs,jars);
 for i=1:numel(jars)
-    if(java_in_octave && ~ismember(jars(1),javaclasspath('-all')))
-        javaaddpath(jars(1));
+    if(java_in_octave && ...
+            all(cellfun('isempty',strfind(javaclasspath('-all'),jars{i}))))
+        javaaddpath(pjars{i});
     end
 end
 clear jars;
 
 % adding the jars for mattaup is not necessary for
 % taup*.m but you might want to do this now if you
 % directly use the jars or objects for some reason
-jars(1)=[path fs 'mattaup' fs 'lib' fs 'TauP-2.1.1.jar'];
-jars(2)=[path fs 'mattaup' fs 'lib' fs 'seisFile-1.5.1.jar'];
-jars(3)=[path fs 'mattaup' fs 'lib' fs 'MatTauP-2.1.1.jar'];
+jars{1}='TauP-2.1.1.jar';
+jars{2}='seisFile-1.5.1.jar';
+jars{3}='MatTauP-2.1.1.jar';
+pjars=strcat(path,fs,'mattaup',fs,'lib',fs,jars);
 for i=1:numel(jars)
-    if(java_in_octave && ~ismember(jars(i),javaclasspath('-all')))
-        javaaddpath(jars(i));
+    if(java_in_octave && ...
+            all(cellfun('isempty',strfind(javaclasspath('-all'),jars{i}))))
+        javaaddpath(pjars{i});
     end
 end
 clear jars;
@@ -115,11 +119,13 @@
 
 % jars (2 of them) for external program njtbx
 % - used by WW3 functions (analyze ocean waves & seismic noise)
-jars(1)=[path fs 'njtbx' fs 'njTools-2.0.12_jre1.6.jar'];
-jars(2)=[path fs 'njtbx' fs 'toolsUI-4.0.49.jar'];
+jars{1}='njTools-2.0.12_jre1.6.jar';
+jars{2}='toolsUI-4.0.49.jar';
+pjars=strcat(path,fs,'njtbx',fs,jars);
 for i=1:numel(jars)
-    if(java_in_octave && ~ismember(jars(i),javaclasspath('-all')))
-        javaaddpath(jars(i));
+    if(java_in_octave && ...
+            all(cellfun('isempty',strfind(javaclasspath('-all'),jars{i}))))
+        javaaddpath(pjars{i});
     end
 end
 clear jars;

Diff for: webinstall_extras.m

@@ -30,9 +30,10 @@
 %        Feb. 21, 2014 - initial version
 %        Feb. 27, 2014 - minor doc update
 %        Mar.  1, 2014 - iscfmdb not ready yet
+%        Mar.  2, 2014 - minor fix to web links
 %
 %     Written by Garrett Euler (ggeuler at wustl dot edu)
-%     Last Updated Mar.  1, 2014 at 15:25 GMT
+%     Last Updated Mar.  2, 2014 at 15:25 GMT
 
 % todo:
 
@@ -72,7 +73,7 @@
 
     % grab files (either locally or remotely)
     url0='http://epsc.wustl.edu/~ggeuler/codes/m/seizmo/';
-    url1='https://s3-us-west-2.amazonaws.com/seizmo/';
+    %url1='https://s3-us-west-2.amazonaws.com/seizmo/'; % backup currently
     fprintf(' Getting %s\n',sacpzdb);
     if(~dlflag && exist(sacpzdb,'file'))
         if(~exist([mypath fs sacpzdb],'file'))
@@ -87,7 +88,7 @@
             copyfile(which(sz3dmod),'.');
         end
     else
-        urlwrite([url1 sz3dmod],sz3dmod);
+        urlwrite([url0 sz3dmod],sz3dmod);
     end
     fprintf(' Getting %s\n',mapfeat);
     if(~dlflag && exist(mapfeat,'file'))
@@ -103,7 +104,7 @@
     %        copyfile(which(iscfmdb),'.');
     %    end
     %else
-    %    urlwrite([url1 iscfmdb],iscfmdb);
+    %    urlwrite([url0 iscfmdb],iscfmdb);
     %end
 
     % unpack files

Diff for: webinstall_irisws.m

@@ -103,7 +103,7 @@
     %   will generate warnings from at least Matlab.
     iriswsjar=[mypath fs irisws];
     if(java_in_octave && ...
-            all(cellfun('isempty',strfind(irisws,javaclasspath('-all')))))
+            all(cellfun('isempty',strfind(javaclasspath('-all'),irisws))))
         javaaddpath(iriswsjar);
     end
 

Diff for: webinstall_njtbx.m

@@ -141,11 +141,11 @@
     toolsuijar=[mypath fs toolsui];
     njtoolsjar=[mypath fs njtools];
     if(java_in_octave && ...
-            all(cellfun('isempty',strfind(toolsui,javaclasspath('-all')))))
+            all(cellfun('isempty',strfind(javaclasspath('-all'),toolsui))))
         javaaddpath(toolsuijar);
     end
     if(java_in_octave && ...
-            all(cellfun('isempty',strfind(njtools,javaclasspath('-all')))))
+            all(cellfun('isempty',strfind(javaclasspath('-all'),njtools))))
         javaaddpath(njtoolsjar);
     end
 

Diff for: webinstall_taup.m

@@ -104,15 +104,15 @@
     seisjar=[mypath fs seis];
     mattaupjar=[mypath fs mattaup];
     if(java_in_octave && ...
-            all(cellfun('isempty',strfind(taup,javaclasspath('-all')))))
+            all(cellfun('isempty',strfind(javaclasspath('-all'),taup))))
         javaaddpath(taupjar);
     end
     if(java_in_octave && ...
-            all(cellfun('isempty',strfind(seis,javaclasspath('-all')))))
+            all(cellfun('isempty',strfind(javaclasspath('-all'),seis))))
         javaaddpath(seisjar);
     end
     if(java_in_octave && ...
-            all(cellfun('isempty',strfind(mattaup,javaclasspath('-all')))))
+            all(cellfun('isempty',strfind(javaclasspath('-all'),mattaup))))
         javaaddpath(mattaupjar);
     end