Commit 78a40a70 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Merge branches 'addie_fix' and 'quicknxs_prod'

parents 809a4bd3 5e945ec0

quicknxs3

+7 −11
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


# select the environment to use

# current default is system version

CONDA_ENVIRON=quicknxs2

if [ -n "$1" ]; then

  if [ "$1" == "--dev" ]; then

    CONDA_ENVIRON=quicknxs2-dev
@@ -12,14 +13,9 @@ if [ -n "$1" ]; then 
  fi

fi



if [ -v CONDA_ENVIRON ];

then

# import library to do the real work

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

# put together arguments - conda_env, application, argv

args=("${CONDA_ENVIRON}" "quicknxs2" "$@")

# launch the tool

activate_and_launch "${args[@]}"
 
else

    /usr/bin/quicknxs2

fi