Commit 3e18fffd authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Merge branch 'remove_unused' into 'main' 

Remove quicknxs-v1 and garnet

See merge request sns-hfir-scse/infrastructure/nsd-app-wrap!96
parents 36aa744f c443fb76

rpm/nsd-app-wrap.spec

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

Version:        1.98

Version:        1.99

Release:        1%{?dist}

Summary:        Wrapper scripts to launch python applications installed via anaconda

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

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

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

install -m 755 ibeatles                               %{buildroot}%{_bindir}/
@@ -49,7 +48,6 @@ install -m 755 nsd-conda-wrap.sh %{buildroot}%{_bindir}/ 
install -m 755 nseplot                                %{buildroot}%{_bindir}/

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

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

install -m 755 quicknxs-v1                            %{buildroot}%{_bindir}/

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

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

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

src/garnet

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
#!/bin/bash



# select the environment to use

# current default is system version

CONDA_ENVIRON=garnet

if [ -n "$1" ]; then

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

    CONDA_ENVIRON=garnet-dev

    shift  # drop this argument

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

    CONDA_ENVIRON=garnet-qa

    shift  # drop this argument

  fi

fi









if [ -v CONDA_ENVIRON ]; then

    # import library to do the real work

    . "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh" \

      || . /bin/nsd-app-wrap.sh



    # put together arguments - conda_env, application, argv

    args=("${CONDA_ENVIRON}" "garnet" "$@")



    # start the application

    activate_and_launch "${args[@]}"

fi

src/quicknxs-v1

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
#!/bin/bash



# select the environment to use

# current default is system version

CONDA_ENVIRON=quicknxs-v1



# set the command to execute under the above environment

COMMAND="quicknxs"



if [ -v CONDA_ENVIRON ]; then



    # import library to do the real work

    # shellcheck disable=SC1091

    . "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh" \

        || . /bin/nsd-app-wrap.sh



    # override the normal call to activate_and_launch() function

    activate_conda_environment "${CONDA_ENVIRON}"



    # remove and rebuild the font cache

    _remove_font_cache

    fc-cache -r



    # start the application

    echo "Execute: ${COMMAND} $*"

    "${COMMAND}" "$@"

fi