Commit 475a8dd5 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Merge branch 'fix_mantid' into 'main' 

Fix mantid launcher scripts

See merge request !16
parents 0a94b53e 4a805249

mantidpython

+1 −7
Original line number Diff line number Diff line 
#!/bin/bash

# import library to do the real work

source "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh"



# put together arguments - conda_env, application, argv

args=("mantid" "mantidpython" "$@")

# launch the tool

activate_and_launch "${args[@]}"
 
$(dirname "$(realpath "$0")")/nsd-conda-wrap.sh mantid "$@"

mantidpythonnightly

+1 −7
Original line number Diff line number Diff line 
#!/bin/bash

# import library to do the real work

source "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh"



# put together arguments - conda_env, application, argv

args=("mantid-dev" "mantidpython" "$@")

# launch the tool

activate_and_launch "${args[@]}"
 
$(dirname "$(realpath "$0")")/nsd-conda-wrap.sh mantid-dev "$@"

mantidpythonqa

+1 −7
Original line number Diff line number Diff line 
#!/bin/bash

# import library to do the real work

source "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh"



# put together arguments - conda_env, application, argv

args=("mantid-qa" "mantidpython" "$@")

# launch the tool

activate_and_launch "${args[@]}"
 
$(dirname "$(realpath "$0")")/nsd-conda-wrap.sh mantid-qa "$@"

mantidworkbench

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
source "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh"



# put together arguments - conda_env, application, argv

args=("mantid" "mantidworkbench" "$@")

CONDA_ENV="mantid"

args=("${CONDA_ENV}" "/opt/anaconda/envs/${CONDA_ENV}/bin/mantidworkbench" "$@")

# remove font-cache to side step startup speed issue

rm -f ${HOME}/.cache/fontconfig/*

# launch the tool

mantidworkbenchnightly

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
source "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh"



# put together arguments - conda_env, application, argv

args=("mantid-dev" "mantidworkbench" "$@")

CONDA_ENV="mantid-dev"

args=("${CONDA_ENV}" "/opt/anaconda/envs/${CONDA_ENV}/bin/mantidworkbench" "$@")

# remove font-cache to side step startup speed issue

rm -f ${HOME}/.cache/fontconfig/*

# launch the tool