Commit 79978cee authored by Hetrick, John's avatar Hetrick, John
Browse files

Merge branch '6mq-remove-crystalplan' into 'main' 

Removed crystalplan

See merge request sns-hfir-scse/infrastructure/nsd-app-wrap!87
parents 619f4083 8aeb4176

rpm/nsd-app-wrap.spec

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

Version:        1.92

Version:        1.93

Release:        1%{?dist}

Summary:        Wrapper scripts to launch python applications installed via anaconda

Vendor:         Peter F. Peterson
@@ -25,7 +25,6 @@ rm -rf $RPM_BUILD_ROOT 
# put things in the bin directory

mkdir -p %{buildroot}%{_bindir}/

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

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

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

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

install -m 755 drtsans                                %{buildroot}%{_bindir}/
@@ -66,7 +65,6 @@ install -m 755 usansred %{buildroot}%{_bindir}/ 


# put icons in the right place

mkdir -p %{buildroot}/%{_datadir}/pixmaps/

install -m 644 desktop/crystalplan.png                %{buildroot}/%{_datadir}/pixmaps/

install -m 644 desktop/garnet.png                     %{buildroot}/%{_datadir}/pixmaps/

install -m 644 desktop/jupyter.svg                    %{buildroot}/%{_datadir}/pixmaps/

install -m 644 desktop/mantid_workbench.png           %{buildroot}/%{_datadir}/pixmaps/
@@ -82,7 +80,6 @@ install -m 644 desktop/inspired.png %{buildroot}/%{_datadir}/p 


# put desktop files in the right place

mkdir -p %{buildroot}%{_datadir}/applications/

install -m 644 desktop/crystalplan.desktop             %{buildroot}%{_datadir}/applications/

install -m 644 desktop/garnet.desktop                  %{buildroot}%{_datadir}/applications/

install -m 644 desktop/jupyter.sns.desktop             %{buildroot}%{_datadir}/applications/

install -m 644 desktop/jupyter.local.desktop           %{buildroot}%{_datadir}/applications/
@@ -109,6 +106,9 @@ install -m 644 desktop/ibeatles.desktop %{buildroot}%{_datadir}/a 


%changelog



* Thu May 29 2025 John Hetrick

- Removed crystalplan



* Wed May 28 2025 John Hetrick

- Removed ntrace

src/crystalplan

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



# select the environment to use

# current default is system version

CONDA_ENVIRON=crystalplan

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}" "crystalplan.py" "$@")



    # start the application

    activate_and_launch "${args[@]}"

fi

src/desktop/crystalplan.desktop

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
#!/usr/bin/env xdg-open

[Desktop Entry]

Encoding=UTF-8

Name=CrystalPlan

Comment=CrystalPlan

Exec=/usr/bin/crystalplan

Icon=crystalplan

StartupNotify=false

Terminal=false

Type=Application

Categories=GNOME;Application;Analysis;

src/desktop/crystalplan.png

deleted100644 → 0
−76 KiB
Loading image diff...