AUDIT: r16932 - gnucash/trunk/packaging/win32 - Win32: Add setlocal to batch scripts.

[Andreas Köhler]

Author: andi5
Date: 2008-02-08 17:56:03 -0500 (Fri, 08 Feb 2008)
New Revision: 16932
Trac: http://svn.gnucash.org/trac/changeset/16932

Modified:
   gnucash/trunk/packaging/win32/gnucash.iss.in
   gnucash/trunk/packaging/win32/install.sh
Log:
Win32: Add setlocal to batch scripts.

This avoids cluttering the environment of the caller.
BP


Modified: gnucash/trunk/packaging/win32/gnucash.iss.in
===================================================================
--- gnucash/trunk/packaging/win32/gnucash.iss.in	2008-02-08 22:23:25 UTC (rev 16931)
+++ gnucash/trunk/packaging/win32/gnucash.iss.in	2008-02-08 22:56:03 UTC (rev 16932)
@@ -184,7 +184,8 @@
 
   { Create the gnucash.bat file; #10 is the linefeed character and #13 CR }
   FileName := appdir + '\bin\gnucash.bat' ;
-  FileString := 'chcp ' + ExpandConstant('{cm:LanguageCodePage}') + ''#13#10 ;
+  FileString := 'setlocal'#13#10 ;
+  FileString := FileString + 'chcp ' + ExpandConstant('{cm:LanguageCodePage}') + ''#13#10 ;
   FileString := FileString + 'set PATH=' + appdir + '\bin;' + libdir + ';' + libdir + '\gnucash;%PATH%'#13#10 ;
 
   FileString := FileString + 'set GUILE_WARN_DEPRECATED=no'#13#10 ;

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2008-02-08 22:23:25 UTC (rev 16931)
+++ gnucash/trunk/packaging/win32/install.sh	2008-02-08 22:56:03 UTC (rev 16932)
@@ -1036,7 +1036,8 @@
 
     # Create a startup script that works without the msys shell
     qpushd $_INSTALL_UDIR/bin
-        echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;%PATH%" > gnucash.bat
+        echo "setlocal" > gnucash.bat
+        echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;%PATH%" >> gnucash.bat
         echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.bat
         echo "set GNC_MODULE_PATH=${INSTALL_DIR}\\lib\\gnucash" >> gnucash.bat
         echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.bat