diff --git a/Code/Installer/generateWxs.py b/Code/Installer/generateWxs.py index 4478358b173912389c5d3b804664f3347e433e70..98701753eb1a3c01fde62cb68e06bd3c182ff31e 100644 --- a/Code/Installer/generateWxs.py +++ b/Code/Installer/generateWxs.py @@ -474,9 +474,9 @@ addDlls('../Third_Party/lib/win' + ARCH,'3dDll',MantidDlls,['hd421m.dll','hdf5dl addTo(MantidDlls,'Environment',{'Id':'UpdatePath','Name':'PATH','Action':'set','Part':'last','Value':'[PYTHON25DIR]'}) # MantidPATH to point to the bin directory mantidbin = '[INSTALLDIR]\\bin' -addTo(MantidDlls,'Environment',{'Id':'SetMtdPath','Name':'MANTIDBIN','Action':'set','Part':'all','Value':mantidbin}) +addTo(MantidDlls,'Environment',{'Id':'SetMtdPath','Name':'MANTIDPATH','Action':'set','Part':'all','Value':mantidbin}) # Also add binary directory to the path -addTo(MantidDlls,'Environment',{'Id':'AddMtdPath','Name':'PATH','Action':'set','Part':'last','Value':'%MANTIDBIN%'}) +addTo(MantidDlls,'Environment',{'Id':'AddMtdPath','Name':'PATH','Action':'set','Part':'last','Value':'%MANTIDPATH%'}) # ---------------------- Matlab bindings ------------------------- # Only on 32bit windows for the moment diff --git a/Code/MacInstaller/installer_hooks/postflight b/Code/MacInstaller/installer_hooks/postflight index 3b32ea9147ffb832b7a9d89fbabe0ec1fce1ddeb..068a019bf3b013c4b25216dfe5ce9e2dc8912dcb 100644 --- a/Code/MacInstaller/installer_hooks/postflight +++ b/Code/MacInstaller/installer_hooks/postflight @@ -9,7 +9,7 @@ echo "=== Starting postflight installer hook ===" echo # ------------- Environmental variable update ----------------------- -# Ensure the MANTIDBIN environmental variable is set correctly by either: +# Ensure the MANTIDPATH environmental variable is set correctly by either: # (a) Creating a new ~/.MacOS/environment.plist file or # (b) Updating an existing file with the current value. echo "Checking current environmental variable status" @@ -20,7 +20,7 @@ if [ ! -d ${env_dir} ]; then mkdir -p ${env_dir} fi -var_name=MANTIDBIN +var_name=MANTIDPATH var_value=/Applications/MantidPlot.app/Contents/MacOS key_value="<key>${var_name}</key>\n<string>${var_value}</string>" diff --git a/Code/RPM_Kit/Mantid/utils/mantid.csh b/Code/RPM_Kit/Mantid/utils/mantid.csh index ad24344f6459f1ce55fc7d076239f33f0a3e9b93..0ec042aed5e4a2692eb07329a042ca48243c3b8e 100755 --- a/Code/RPM_Kit/Mantid/utils/mantid.csh +++ b/Code/RPM_Kit/Mantid/utils/mantid.csh @@ -1,3 +1,3 @@ #!/bin/csh -setenv MANTIDBIN "MANTIDBINDIR" -setenv PATH "${PATH}:${MANTIDBIN}" +setenv MANTIDPATH "MANTIDBINDIR" +setenv PATH "${PATH}:${MANTIDPATH}" diff --git a/Code/RPM_Kit/Mantid/utils/mantid.sh b/Code/RPM_Kit/Mantid/utils/mantid.sh index 5777f35ec2309f807544ab4629102804d4bc4acb..aa616141db3d20ef47f6818df4ffdd4c34beef55 100755 --- a/Code/RPM_Kit/Mantid/utils/mantid.sh +++ b/Code/RPM_Kit/Mantid/utils/mantid.sh @@ -1,4 +1,4 @@ #!/bin/sh -MANTIDBIN=MANTIDBINDIR -PATH=${PATH}:${MANTIDBIN} -export MANTIDBIN PATH +MANTIDPATH=MANTIDBINDIR +PATH=${PATH}:${MANTIDPATH} +export MANTIDPATH PATH