Commit b0e995a6 authored by Petras, Randy's avatar Petras, Randy
Browse files

Merge branch 'pixi_do_over' into 'main' 

Do not use pre-defined tasks to allow for working on read-only filesystems

See merge request sns-hfir-scse/infrastructure/nsd-app-wrap!114
parents 25ab4f1e 35ff57b0

rpm/nsd-app-wrap.spec

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

Version:        2.11

Version:        2.12

Release:        1%{?dist}

Summary:        Wrapper scripts to launch python applications installed via anaconda

Vendor:         Peter F. Peterson
@@ -27,7 +27,8 @@ 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 gsas2                                  %{buildroot}%{_bindir}/

# no pixi environment exists yet

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

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

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

install -m 755 inspired                               %{buildroot}%{_bindir}/
@@ -41,7 +42,8 @@ install -m 755 mantidpython %{buildroot}%{_bindir}/ 
install -m 755 mantidworkbench                        %{buildroot}%{_bindir}/

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

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

install -m 755 neutron-imaging                        %{buildroot}%{_bindir}/

# not used right now - things that look like scriptlets cannot be in comments

#install -m 755 neutron-imaging                        {buildroot}{_bindir}/

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

install -m 755 nsd-app-wrap.sh                        %{buildroot}%{_bindir}/

install -m 755 nsd-conda-wrap.sh                      %{buildroot}%{_bindir}/

src/addie

+2 −2
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ fi 


# put together arguments - conda_env, application, argv

if [ -n "${mode_arg}" ]; then

  args=("${PIXI_ENVIRON}" "start_gui" "${mode_arg}" "${@}")

  args=("${PIXI_ENVIRON}" "addie" "${mode_arg}" "${@}")

else

  args=("${PIXI_ENVIRON}" "start_gui" "${@}")

  args=("${PIXI_ENVIRON}" "addie" "${@}")

fi

# launch the tool

pixi_launch "${args[@]}"

src/gsas2

+9 −12
Original line number Diff line number Diff line 
#!/bin/sh



# select the environment to use

PIXI_ENVIRON=gsas2



# 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=("${PIXI_ENVIRON}" "start_gui" "$@")

# launch the tool

pixi_launch "${args[@]}"

######################################################################

# Currently this scipt is not used

######################################################################

exit 1



######################################################################

# remove a single # from each of the following lines

######################################################################

#"$(dirname "$(realpath "$0")")/nsd-conda-wrap.sh" gsas2 --classic /path/to/GSASII.py

src/hyspecppt

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ fi 
  || . /bin/nsd-app-wrap.sh



# put together arguments - conda_env, application, argv

args=("${PIXI_ENVIRON}" "start_gui" "$@")

args=("${PIXI_ENVIRON}" "hyspecppt" "$@")

# launch the tool

pixi_launch "${args[@]}"

src/ibeatles

+1 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ PIXI_ENVIRON=ibeatles 
  || . /bin/nsd-app-wrap.sh



# put together arguments - conda_env, application, argv

args=("${PIXI_ENVIRON}" "start_gui" "$@")

args=("${PIXI_ENVIRON}" "start" "$@")

# launch the tool

pixi_launch "${args[@]}"