# HG changeset patch
# User John Donoghue
# Date 1464812020 14400
# Node ID 84a6afd1c63287ceff5d57d586eb2120dec2098b
# Parent  908a2a0cf6d6d3bbe100eda7ba48303537677430
build_packages.m: restore more and echo state after running build script

build_packages.m: save and restore echo and more state within unwind_protect block

diff -r 908a2a0cf6d6 -r 84a6afd1c632 build_packages.m
--- a/build_packages.m	Wed Jun 01 07:58:16 2016 -0400
+++ b/build_packages.m	Wed Jun 01 16:13:40 2016 -0400
@@ -1,10 +1,7 @@
-more ("off");
-echo ("on");
-% cd to script directory as the packages files are in the same place
-[packagedir] = fileparts(mfilename("fullpathext"));
-if length(packagedir) > 0
-  cd(packagedir);
-endif
+% attempt to compile and install the octave packages
+
+orig_echo = echo_executing_commands ();
+orig_more = page_screen_output();
 
 % helper function to try install a package, and recover
 function try_install (pkgname)
@@ -19,51 +16,67 @@
   cd (currdir);
 endfunction
 
-% install the packages
-try_install general-2.0.0.tar.gz
-try_install miscellaneous-1.2.1.tar.gz
-try_install struct-1.0.13.tar.gz
-try_install optim-1.5.1.tar.gz
-try_install specfun-1.1.0.tar.gz
-try_install control-3.0.0.tar.gz
-try_install signal-1.3.2.tar.gz
-try_install communications-1.2.1.tar.gz
-try_install image-2.4.1.tar.gz
-try_install io-2.4.1.tar.gz
-try_install statistics-1.2.4.tar.gz
-try_install geometry-2.1.1.tar.gz
-try_install windows-1.2.3.tar.gz
-try_install odepkg-0.8.5.tar.gz
-try_install linear-algebra-2.2.2.tar.gz
-try_install sockets-1.2.0.tar.gz
-try_install zenity-0.5.7.tar.gz
-try_install data-smoothing-1.3.0.tar.gz
-try_install fuzzy-logic-toolkit-0.4.5.tar.gz
-try_install quaternion-2.4.0.tar.gz
-try_install fits-1.0.7.tar.gz
-try_install fl-core-1.0.0.tar.gz
-try_install tsa-4.4.1.tar.gz
-try_install dicom-0.1.1.tar.gz
-try_install netcdf-1.0.11.tar.gz
-try_install ltfat-2.1.2.tar.gz
-try_install database-2.4.1.tar.gz
-try_install instrument-control-0.2.2.tar.gz
-try_install generate_html-0.1.10.tar.gz
-try_install financial-0.5.0.tar.gz
-try_install stk-2.3.4.tar.gz
-try_install splines-1.3.0.tar.gz
-try_install dataframe-1.1.0.tar.gz
-try_install lssa-0.1.2.tar.gz
-try_install queueing-1.2.3.tar.gz
-try_install nurbs-1.3.10.tar.gz
-try_install strings-1.2.0.tar.gz
-try_install ga-0.10.0.tar.gz
-try_install interval-1.4.1.tar.gz
-try_install nan-3.0.1.tar.gz
-try_install ocs-0.1.5.tar.gz
-try_install mapping-1.2.1.tar.gz
-try_install tisean-0.2.3.tar.gz
-try_install sparsersb-1.0.0.tar.gz
-try_install video-1.2.2.tar.gz
-try_install zeromq-1.1.0.tar.gz
+unwind_protect
+
+  more ("off");
+  echo ("on");
+
+  % cd to script directory as the packages files are in the same place
+  [packagedir] = fileparts(mfilename("fullpathext"));
+  if length(packagedir) > 0
+    cd(packagedir);
+  endif
 
+  % install the packages
+  try_install general-2.0.0.tar.gz
+  try_install miscellaneous-1.2.1.tar.gz
+  try_install struct-1.0.13.tar.gz
+  try_install optim-1.5.1.tar.gz
+  try_install specfun-1.1.0.tar.gz
+  try_install control-3.0.0.tar.gz
+  try_install signal-1.3.2.tar.gz
+  try_install communications-1.2.1.tar.gz
+  try_install image-2.4.1.tar.gz
+  try_install io-2.4.1.tar.gz
+  try_install statistics-1.2.4.tar.gz
+  try_install geometry-2.1.1.tar.gz
+  try_install windows-1.2.3.tar.gz
+  try_install odepkg-0.8.5.tar.gz
+  try_install linear-algebra-2.2.2.tar.gz
+  try_install sockets-1.2.0.tar.gz
+  try_install zenity-0.5.7.tar.gz
+  try_install data-smoothing-1.3.0.tar.gz
+  try_install fuzzy-logic-toolkit-0.4.5.tar.gz
+  try_install quaternion-2.4.0.tar.gz
+  try_install fits-1.0.7.tar.gz
+  try_install fl-core-1.0.0.tar.gz
+  try_install tsa-4.4.1.tar.gz
+  try_install dicom-0.1.1.tar.gz
+  try_install netcdf-1.0.11.tar.gz
+  try_install ltfat-2.1.2.tar.gz
+  try_install database-2.4.1.tar.gz
+  try_install instrument-control-0.2.2.tar.gz
+  try_install generate_html-0.1.10.tar.gz
+  try_install financial-0.5.0.tar.gz
+  try_install stk-2.3.4.tar.gz
+  try_install splines-1.3.0.tar.gz
+  try_install dataframe-1.1.0.tar.gz
+  try_install lssa-0.1.2.tar.gz
+  try_install queueing-1.2.3.tar.gz
+  try_install nurbs-1.3.10.tar.gz
+  try_install strings-1.2.0.tar.gz
+  try_install ga-0.10.0.tar.gz
+  try_install interval-1.4.1.tar.gz
+  try_install nan-3.0.1.tar.gz
+  try_install ocs-0.1.5.tar.gz
+  try_install mapping-1.2.1.tar.gz
+  try_install tisean-0.2.3.tar.gz
+  try_install sparsersb-1.0.0.tar.gz
+  try_install video-1.2.2.tar.gz
+  try_install zeromq-1.1.0.tar.gz
+
+unwind_protect_cleanup
+  echo_executing_commands (orig_echo);
+  page_screen_output(orig_more);
+  clear ("orig_echo", "orig_more");
+end_unwind_protect