Commit f30d64e2 authored by Borreguero Calvo, Jose's avatar Borreguero Calvo, Jose
Browse files

Merge branch 'nr_launcher_update' into 'main' 

update nr_launcher to check for conda environment existence

See merge request !88
parents 79978cee df15217b

rpm/nsd-app-wrap.spec

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

Version:        1.93

Version:        1.94

Release:        1%{?dist}

Summary:        Wrapper scripts to launch python applications installed via anaconda

Vendor:         Peter F. Peterson
@@ -106,6 +106,9 @@ install -m 644 desktop/ibeatles.desktop %{buildroot}%{_datadir}/a 


%changelog



* Mon Jun 09 2025 Jose Borreguero

- Update the nr_launcher scripts



* Thu May 29 2025 John Hetrick

- Removed crystalplan

src/nr_launcher

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 
# select the environment to use

CONDA_ENVIRON=refl1d



# check if the conda environment exists

if ! conda env list | \grep -q "^${CONDA_ENVIRON}[[:space:]]"; then

    CONDA_ENVIRON=refl1d-qa

fi



if [ -v CONDA_ENVIRON ]; then

    # import library to do the real work

    # shellcheck disable=SC1091