Verified Commit af630e84 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Stop installing the neutron-imaging launcher 

Currently, the imaging users are using a different approach for using
the appropriate software.
parent 3ca9a047

rpm/nsd-app-wrap.spec

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,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/neutron-imaging

+35 −26
Original line number Diff line number Diff line 
#!/bin/sh



# select the environment to use

CONDA_ENVIRON=neutron-imaging

NOTEBOOK_DIR=~/notebooks/IPTS_notebooks

if [ -n "$1" ]; then

  if [ "--dev" = "$1" ]; then

    CONDA_ENVIRON=neutron-imaging-dev

    NOTEBOOK_DIR=~/notebooks/IPTS_notebooks_testing

    shift  # drop this argument

  fi

fi

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

# Currently this scipt is not used

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

echo "Contact Jean Bilheux <bilheuxjm@ornl.gov> for alternate method of running the notebooks"

exit 1



# import library to do the real work

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



# activate the environment - will be deactivated on exit

activate_conda_environment "${CONDA_ENVIRON}"



# start the application

echo "Update the notebooks..."

rsync --exclude '.git*' -a /SNS/software/share/jupyter/notebooks/ ~/notebooks/

echo "Done!"



cd $NOTEBOOK_DIR || exit 1



echo "Starting Jupyter... (be patient please while we set up your system!)"

# assumes the correct jupyter is in the path

jupyter notebook notebooks
 
######################################################################

# remove a single # from each of the following lines

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

## select the environment to use

#CONDA_ENVIRON=neutron-imaging

#NOTEBOOK_DIR=~/notebooks/IPTS_notebooks

#if [ -n "$1" ]; then

#  if [ "--dev" = "$1" ]; then

#    CONDA_ENVIRON=neutron-imaging-dev

#    NOTEBOOK_DIR=~/notebooks/IPTS_notebooks_testing

#    shift  # drop this argument

#  fi

#fi

#

## import library to do the real work

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

#

## activate the environment - will be deactivated on exit

#activate_conda_environment "${CONDA_ENVIRON}"

#

## start the application

#echo "Update the notebooks..."

#rsync --exclude '.git*' -a /SNS/software/share/jupyter/notebooks/ ~/notebooks/

#echo "Done!"

#

#cd $NOTEBOOK_DIR || exit 1

#

#echo "Starting Jupyter... (be patient please while we set up your system!)"

## assumes the correct jupyter is in the path

#jupyter notebook notebooks