Commit 5dabecc9 authored by Hetrick, John's avatar Hetrick, John
Browse files

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

Replaced snapred with snapblue

See merge request sns-hfir-scse/infrastructure/nsd-app-wrap!85
parents 8d926da5 56e4b5c0

rpm/nsd-app-wrap.spec

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

Version:        1.90

Version:        1.91

Release:        1%{?dist}

Summary:        Wrapper scripts to launch python applications installed via anaconda

Vendor:         Peter F. Peterson
@@ -60,7 +60,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 snapred                                %{buildroot}%{_bindir}/

install -m 755 snapblue                                %{buildroot}%{_bindir}/

install -m 755 stog                                   %{buildroot}%{_bindir}/

install -m 755 triplets                               %{buildroot}%{_bindir}/

install -m 755 usansred                               %{buildroot}%{_bindir}/
@@ -110,6 +110,9 @@ install -m 644 desktop/ibeatles.desktop %{buildroot}%{_datadir}/a 


%changelog



* Tue May 27 2025 Ian Gibbs

- replaced snapred with snapblue



* Thu May 22 2025 Glass Elsarboukh

- refl1d desktop entry points to qa

src/snapred→src/snapblue

+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=snapred

CONDA_ENVIRON=snapblue

if [ -n "$1" ]; then

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

    CONDA_ENVIRON=snapred-dev

    CONDA_ENVIRON=snapblue-dev

    shift # drop this argument

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

    CONDA_ENVIRON=snapred-qa

    CONDA_ENVIRON=snapblue-qa

    shift # drop this argument

  fi

fi