diff --git a/rpm/nsd-app-wrap.spec b/rpm/nsd-app-wrap.spec index 581f0532def00d79479e49ed66dab30bf015cdf1..9840f19b5d88eb1523501ef024e87a5c4e1a4383 100644 --- a/rpm/nsd-app-wrap.spec +++ b/rpm/nsd-app-wrap.spec @@ -1,5 +1,5 @@ Name: nsd-app-wrap -Version: 2.4 +Version: 2.5 Release: 1%{?dist} Summary: Wrapper scripts to launch python applications installed via anaconda Vendor: Peter F. Peterson @@ -27,7 +27,6 @@ mkdir -p %{buildroot}%{_bindir}/ install -m 755 addie %{buildroot}%{_bindir}/ install -m 755 data2config %{buildroot}%{_bindir}/ install -m 755 drtsans %{buildroot}%{_bindir}/ -install -m 755 expgui %{buildroot}%{_bindir}/ install -m 755 gsas2 %{buildroot}%{_bindir}/ install -m 755 hyspecppt %{buildroot}%{_bindir}/ install -m 755 ibeatles %{buildroot}%{_bindir}/ diff --git a/src/expgui b/src/expgui deleted file mode 100644 index 442061601f0eeafd3eab922f38bc5237ce9dc386..0000000000000000000000000000000000000000 --- a/src/expgui +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -__main() { - - # EXPGUI needs to run outside the context of conda. This wrapper - # script excises any conda related paths from the user's PATH - # environment variable to invoke the runtime application. - - local readonly path_outset="$PATH" - local path_revised conda_root - - conda_root="/opt/anaconda" - - # read conda environment vars to determine the root prefix - if [[ -n "$CONDA_PREFIX_1" ]] ; then conda_root="$CONDA_PREFIX_1" - elif [[ -n "$CONDA_PREFIX" ]] ; then conda_root="$CONDA_PREFIX" - fi - - # remove conda_root from PATH - read -a path_revised <<< $( - echo ${path_outset} | tr ':' '\n' | sort | uniq \ - | grep -v "^${conda_root}" | tr '\n' ':' | sed 's/:$//g' \ - ) - - # use inline variable assignment to set PATH - # when invoking the EXPGUI runtime - PATH="${path_revised}" /SNS/software/gsas/expgui/expgui "$@" -} - -__main "$@" -