diff --git a/rpm/nsd-app-wrap.spec b/rpm/nsd-app-wrap.spec index c330d0d30039b0877dc2c7a87641ea494ac271d2..0fdc29906f8a2c216ef33d84ab923ae93b22dfab 100644 --- a/rpm/nsd-app-wrap.spec +++ b/rpm/nsd-app-wrap.spec @@ -1,5 +1,5 @@ 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}/ diff --git a/src/nr_launcher b/src/nr_launcher old mode 100644 new mode 100755 index a5fabf3bc4815827a4a469c0f1cc3cff47ebd2bb..15785c96ebb12bb5bf17edab043a555cffe9bb61 --- a/src/nr_launcher +++ b/src/nr_launcher @@ -1,2 +1,12 @@ #!/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[@]}"