From 163a1bdfc44ea52445c911f414485b22dcfd1981 Mon Sep 17 00:00:00 2001
From: Darsh <ddarsh5544@gmail.com>
Date: Wed, 20 Aug 2025 08:41:46 -0400
Subject: [PATCH 1/3] Remove expgui from nsd-app-wrap

---
 src/expgui | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 src/expgui

diff --git a/src/expgui b/src/expgui
deleted file mode 100644
index 4420616..0000000
--- 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 "$@"
-
-- 
GitLab


From a91d236ebf0de17ed7ba71f680f41a19fdedc25c Mon Sep 17 00:00:00 2001
From: Darsh <ddarsh5544@gmail.com>
Date: Wed, 20 Aug 2025 08:46:46 -0400
Subject: [PATCH 2/3] Remove exgui dependency from nsd-app-wrap.spec

---
 rpm/nsd-app-wrap.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rpm/nsd-app-wrap.spec b/rpm/nsd-app-wrap.spec
index 581f053..5d0dc1a 100644
--- a/rpm/nsd-app-wrap.spec
+++ b/rpm/nsd-app-wrap.spec
@@ -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}/
-- 
GitLab


From 60615166bbd109ad741310a2c42ea38b9a0e6966 Mon Sep 17 00:00:00 2001
From: Darsh <ddarsh5544@gmail.com>
Date: Wed, 20 Aug 2025 08:55:21 -0400
Subject: [PATCH 3/3] Increament version within nsd-app-wrap.spec to 2.5

---
 rpm/nsd-app-wrap.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpm/nsd-app-wrap.spec b/rpm/nsd-app-wrap.spec
index 5d0dc1a..9840f19 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
-- 
GitLab