comparison SMALLboxSetup.m @ 33:f6b49c9d728c

(none)

     try
         SPGL1_path = [SMALL_path,FS,'toolboxes',FS,'SPGL1'];
         if exist([SPGL1_path, FS, 'spgl1-1.7.zip'],'file'),
             SPGL1_zip=[SPGL1_path, FS, 'spgl1-1.7.zip'];
         else
-            SPGL1_zip='http://www.cs.ubc.ca/labs/scl/spgl1/downloads.php?filename=spgl1-1.7.zip';
+            SPGL1_zip='http://www.cs.ubc.ca/~mpf/downloads/spgl1-1.7.zip';
             fprintf('\n\n Downloading toolbox, please be patient\n\n');
         end
         unzip(SPGL1_zip,SPGL1_path);
         SPGL1_p=genpath(SPGL1_path);
         addpath(SPGL1_p);

         fprintf('\n SparseLab Installation Successful!\n');
     catch
         fprintf('\n SparseLab Installation Failed\n');
         cd(SMALL_path);
     end
+    cd(SMALL_path);
 else
     fprintf('\n ******************************************************************');
     fprintf('\n\n SparseLab is already installed');
 end
 %%

         Sparsify_p=genpath(Sparsify_path);
         addpath(Sparsify_p);
         fprintf('\n Sparsify Installation Successful\n');
     catch
         fprintf('\n Sparsify Installation Failed\n');
-        cd(SMALL_path);
-    end
+    end
+    cd(SMALL_path);
 else
     fprintf('\n ******************************************************************');
     fprintf('\n\n Sparsify is already installed');
 end
 %%

         else
             GPSR_zip='http://www.lx.it.pt/~mtf/GPSR/GPSR_6.0.zip';
             fprintf('\n\n Downloading toolbox, please be patient\n\n');
         end
         unzip(GPSR_zip,GPSR_path);
+        
         GPSR_p=genpath(GPSR_path);
         addpath(GPSR_p);
         fprintf('\n GPSR Installation Successful\n');
     catch
         fprintf('\n GPSR Installation Failed');
-        cd(SMALL_path);
-    end
+    end
+    cd(SMALL_path);
 else
     fprintf('\n ******************************************************************');
     fprintf('\n\n GPSR is already installed');
 end