From c443fb76cdc57de37896ac924f5b2d11f5319fd6 Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Wed, 23 Jul 2025 12:17:49 -0400
Subject: [PATCH] Remove quicknxs-v1 and garnet

---
 rpm/nsd-app-wrap.spec |  4 +---
 src/garnet            | 29 -----------------------------
 src/quicknxs-v1       | 27 ---------------------------
 3 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 src/garnet
 delete mode 100644 src/quicknxs-v1

diff --git a/rpm/nsd-app-wrap.spec b/rpm/nsd-app-wrap.spec
index 2fb5b42..2598ba0 100644
--- a/rpm/nsd-app-wrap.spec
+++ b/rpm/nsd-app-wrap.spec
@@ -1,5 +1,5 @@
 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}/
diff --git a/src/garnet b/src/garnet
deleted file mode 100644
index 5b13658..0000000
--- a/src/garnet
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/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
diff --git a/src/quicknxs-v1 b/src/quicknxs-v1
deleted file mode 100644
index 8cc956d..0000000
--- a/src/quicknxs-v1
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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
-- 
GitLab