Commit 672aadc3 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Merge branch 'add-garnet' into 'main' 

create garnet files

See merge request !52
parents 427ae627 0bd8da91

rpm/nsd-app-wrap.spec

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

Version:        1.58

Version:        1.59

Release:        1%{?dist}

Summary:        Wrapper scripts to launch python applications installed via anaconda

Vendor:         Peter F. Peterson
@@ -51,6 +51,7 @@ install -m 755 crystalplan %{buildroot}%{_bindir}/ 
install -m 755 paraview                               %{buildroot}%{_bindir}/

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

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

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



# put icons in the right place

mkdir -p %{buildroot}/%{_datadir}/pixmaps/
@@ -63,6 +64,7 @@ install -m 644 desktop/quicknxs.png %{buildroot}/%{_datadir}/p 
install -m 644 desktop/paraview.png                   %{buildroot}/%{_datadir}/pixmaps/

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

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

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



# put desktop files in the right place

mkdir -p %{buildroot}%{_datadir}/applications/
@@ -75,6 +77,7 @@ install -m 644 desktop/jupyter.local.desktop %{buildroot}%{_datadir}/a 
install -m 644 desktop/quicknxs.desktop                %{buildroot}%{_datadir}/applications/

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

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

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



%files

%{_bindir}/*
@@ -82,6 +85,12 @@ install -m 644 desktop/paraview.desktop %{buildroot}%{_datadir}/a 
%{_prefix}/share/applications/*



%changelog

* Fri Mar 22 2024 Kevin Tactac

- Add garnet .png



* Wed Mar 20 2024 Kevin Tactac

- Add garnet



* Thu Feb 29 2024 Jose Borreguero

- Add usans

src/desktop/garnet.desktop

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

[Desktop Entry]

Version=1.0

Type=Application

Name=garnet

Comment=The Single Crystal Graphical Advanced Reduction Neutron Event Toolkit

Exec=/usr/bin/garnet

TryExec=garnet

Icon=garnet

src/desktop/garnet.png

0 → 100644
+4.32 KiB
Loading image diff...

src/garnet

0 → 100644
+28 −0
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

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



    # put together arguments - conda_env, application, argv

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



    # start the application

    activate_and_launch "${args[@]}"

fi