Commit f4d268d6 authored by Hetrick, John's avatar Hetrick, John
Browse files

Merge branch '6mq-snapblue-snapwrap' into 'main'

Replaced snapblue with snapwrap

See merge request !90
parents f30d64e2 94ae32e8
Loading
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
Name:           nsd-app-wrap
Version:        1.94
Version:        1.95
Release:        1%{?dist}
Summary:        Wrapper scripts to launch python applications installed via anaconda
Vendor:         Peter F. Peterson
@@ -58,7 +58,7 @@ install -m 755 rmcprofile %{buildroot}%{_bindir}/
install -m 755 rmcprofile_wrap.sh                     %{buildroot}%{_bindir}/
install -m 755 sasview                                %{buildroot}%{_bindir}/
install -m 755 shiver                                 %{buildroot}%{_bindir}/
install -m 755 snapblue                                %{buildroot}%{_bindir}/
install -m 755 snapwrap                               %{buildroot}%{_bindir}/
install -m 755 stog                                   %{buildroot}%{_bindir}/
install -m 755 triplets                               %{buildroot}%{_bindir}/
install -m 755 usansred                               %{buildroot}%{_bindir}/
@@ -106,6 +106,9 @@ install -m 644 desktop/ibeatles.desktop %{buildroot}%{_datadir}/a

%changelog

* Mon Jun 16 2025 John Hetrick
- Renamed snapblue to snapwrap

* Mon Jun 09 2025 Jose Borreguero
- Update the nr_launcher scripts

+3 −3
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@

# select the environment to use
# current default is system version
CONDA_ENVIRON=snapblue
CONDA_ENVIRON=snapwrap
if [ -n "$1" ]; then
  if [ "$1" == "--dev" ]; then
    CONDA_ENVIRON=snapblue-dev
    CONDA_ENVIRON=snapwrap-dev
    shift # drop this argument
  elif [ "$1" == "--qa" ]; then
    CONDA_ENVIRON=snapblue-qa
    CONDA_ENVIRON=snapwrap-qa
    shift # drop this argument
  fi
fi