Commit 103c38fd authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Merge branch 'bugfix_nr_launcher' into 'main'

Bugfix nr launcher

See merge request !120
parents 0276e08d a2228bc9
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
Name:           nsd-app-wrap
Version:        2.17
Version:        2.18
Release:        1%{?dist}
Summary:        Wrapper scripts to launch python applications installed via anaconda
Vendor:         Peter F. Peterson
@@ -42,6 +42,7 @@ install -m 755 mantidpython %{buildroot}%{_bindir}/
install -m 755 mantidworkbench                        %{buildroot}%{_bindir}/
install -m 755 mantidtotalscattering                  %{buildroot}%{_bindir}/
install -m 755 mcstas                                 %{buildroot}%{_bindir}/
install -m 755 nexpy                                  %{buildroot}%{_bindir}/
# not used right now - things that look like scriptlets cannot be in comments
#install -m 755 neutron-imaging                        {buildroot}{_bindir}/
install -m 755 nr_launcher                            %{buildroot}%{_bindir}/

src/nr_launcher

100644 → 100755
+11 −1
Original line number Diff line number Diff line
#!/bin/bash
cd /SNS/REF_L/shared/launcher; python launcher.py

# import library to do the real work
# shellcheck disable=SC1091
. "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh" \
  || . /bin/nsd-app-wrap.sh


# put together arguments - conda_env, application, argv
args=("refl1d" "python /SNS/REF_L/shared/launcher/launcher.py" "$@")
# launch the tool
pixi_launch "${args[@]}"