Commit a0676563 authored by Petras, Randy's avatar Petras, Randy
Browse files

Merge branch 'mantidworkbench' into 'main' 

Get --version argument working in mantidworkbenchnightly again

See merge request !118
parents a1a782e6 732cf4d1

.gitignore

+3 −0
Original line number Diff line number Diff line 
# ./rpmbuild creates tarballs as part of the process

*.tar.gz

# pixi environments

.pixi/*

!.pixi/config.toml

rpm/nsd-app-wrap.spec

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

Version:        2.15

Version:        2.16

Release:        1%{?dist}

Summary:        Wrapper scripts to launch python applications installed via anaconda

Vendor:         Peter F. Peterson

src/mantidworkbenchnightly

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

# call the main mantidworkbench with an environment

PIXI_ENV="mantid_dev"

"$(dirname "$(realpath "$0")")/mantidworkbench" --env "${PIXI_ENV}"
 
"$(dirname "$(realpath "$0")")/mantidworkbench" --env "${PIXI_ENV}" "$@"

src/mantidworkbenchqa

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

# call the main mantidworkbench with an environment

PIXI_ENV="mantid_qa"

"$(dirname "$(realpath "$0")")/mantidworkbench" --env "${PIXI_ENV}"
 
"$(dirname "$(realpath "$0")")/mantidworkbench" --env "${PIXI_ENV}" "$@"