Commit cfd50d29 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Merge branch '24u_pixi_updates_to_launchers' into 'main' 

24u pixi updates to launchers

See merge request sns-hfir-scse/infrastructure/nsd-app-wrap!105
parents caf1c229 be3d3bf5

rpm/nsd-app-wrap.spec

+1 −1
Original line number Diff line number Diff line 
Name:           nsd-app-wrap

Version:        2.6

Version:        2.7

Release:        1%{?dist}

Summary:        Wrapper scripts to launch python applications installed via anaconda

Vendor:         Peter F. Peterson

src/addie

+6 −6
Original line number Diff line number Diff line
@@ -5,18 +5,18 @@ 
unset SESSION_MANAGER



# select the environment to use

CONDA_ENVIRON=addie

PIXI_ENVIRON=addie

# If `dev` or `qa` version requested, default to `--mode=mantid`.

mode_arg=""

if [ -n "$1" ]; then

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

    CONDA_ENVIRON=addie-dev

    PIXI_ENVIRON=addie_dev

    shift # drop this argument

    if [ -z "$1" ]; then

      mode_arg="--mode=mantid"

    fi

  elif [ "$1" == "--qa" ]; then

    CONDA_ENVIRON=addie-qa

    PIXI_ENVIRON=addie_qa

    shift # drop this argument

    if [ -z "$1" ]; then

      mode_arg="--mode=mantid"
@@ -31,9 +31,9 @@ fi 


# put together arguments - conda_env, application, argv

if [ -n "${mode_arg}" ]; then

  args=("${CONDA_ENVIRON}" "addie" "${mode_arg}" "${@}")

  args=("${PIXI_ENVIRON}" "start_gui" "${mode_arg}" "${@}")

else

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

  args=("${PIXI_ENVIRON}" "start_gui" "${@}")

fi

# launch the tool

activate_and_launch "${args[@]}"
 
pixi_launch "${args[@]}"

src/drtsans

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



# select the environment to use

CONDA_ENVIRON=sans

PIXI_ENVIRON=sans

if [ -n "$1" ]; then

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

    CONDA_ENVIRON=sans-dev

    PIXI_ENVIRON=sans_dev

    shift  # drop this argument

  elif [ "$1" == "--qa" ]; then

    CONDA_ENVIRON=sans-qa

    PIXI_ENVIRON=sans_qa

    shift  # drop this argument

  fi

fi
@@ -20,9 +20,10 @@ if [ -n "$1" ] && [ "$1" == "--classic" ]; then 
fi



# import library to do the real work

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

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

  || . /bin/nsd-app-wrap.sh



# put together arguments - conda_env, application, argv

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

args=("${PIXI_ENVIRON}" "${STARTUP}" "$@")

# launch the tool

activate_and_launch "${args[@]}"
 
pixi_launch "${args[@]}"

src/gsas2

+7 −6
Original line number Diff line number Diff line 
#!/bin/sh



# select the environment to use

CONDA_ENVIRON=gsas2

PIXI_ENVIRON=gsas2



# import library to do the real work

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

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

  || . /bin/nsd-app-wrap.sh



# activate the environment - will be deactivated on exit

activate_conda_environment "${CONDA_ENVIRON}"

# put together arguments - conda_env, application, argv

args=("${PIXI_ENVIRON}" "start_gui" "$@")

# launch the tool

pixi_launch "${args[@]}"

# start the application

python "${CONDA_PREFIX}/GSASII/GSASII.py"

src/hyspecppt

+6 −5
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


# select the environment to use

# current default is system version

CONDA_ENVIRON=hyspecppt

PIXI_ENVIRON=hyspecppt

if [ -n "$1" ]; then

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

    CONDA_ENVIRON=hyspecppt-dev

    PIXI_ENVIRON=hyspecppt_dev

    shift # drop this argument

  elif [ "$1" == "--qa" ]; then

    CONDA_ENVIRON=hyspecppt-qa

    PIXI_ENVIRON=hyspecppt_qa

    shift # drop this argument

  fi

fi
@@ -17,7 +17,8 @@ fi 
# shellcheck disable=SC1091

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

  || . /bin/nsd-app-wrap.sh



# put together arguments - conda_env, application, argv

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

args=("${PIXI_ENVIRON}" "start_gui" "$@")

# launch the tool

activate_and_launch "${args[@]}"
 
pixi_launch "${args[@]}"