Simplify directory paths and naming of scripts

Author: Eliot Eshelman

README.md

@@ -11,18 +11,18 @@ ubiquitous screen utility) and resource monitoring (via htop/top).
 
 ###Usage
 
-Ensure the `mcms_interactive_session` script is in your PATH (usually this is
+Ensure the `interactive_session` script is in your PATH (usually this is
 already done for you by the system administrator). From your shell, run:
-`mcms_interactive_session`
+`interactive_session`
 
 To see a full list of options, run:
-`mcms_interactive_session -h`
+`interactive_session -h`
 
 The script will allocate the requested cluster resources, wait for them to
 become available and then log you into the compute node. You may specify which
 resources you require via command-line arguments (or via your own configuration
-file: `~/.config/mcms_interactive_session.conf`). Your administrator may have
-also set up a system-wide configuration file (but any options you specify will
+file: `~/.config/interactive_session.conf`). Your administrator may have also
+set up a system-wide configuration file (but any options you specify will
 over-ride the default settings in the system-wide configuration file).
 
 ###Installation Requirements

etc/microway/mcms_interactive_screenrc.conf renamed to etc/microway/interactive_screenrc.conf

@@ -56,8 +56,8 @@ export SCRIPT_DIR="$( dirname "$( readlink -f "${BASH_SOURCE[0]}" )" )"
 export SLURM_PATH="$( dirname "$( readlink -f "$(which squeue)" )" )"
 
 
-GLOBAL_CONFIG=/etc/microway/mcms_interactive_session.conf
-USER_CONFIG=~/.config/mcms_interactive_session.conf
+GLOBAL_CONFIG=/etc/microway/interactive_session.conf
+USER_CONFIG=~/.config/interactive_session.conf
 
 
 function help() {
@@ -107,7 +107,7 @@ function help() {
                    (major changes by Josh McSavaney)
 
     Modified scripts (with bugfixes and additional feature support):
-      Copyright (C) 2015 Microway, Inc. All rights reserved.
+      Copyright (C) 2015-2016 Microway, Inc. All rights reserved.
       http://www.microway.com
 
 EOF
@@ -415,10 +415,10 @@ assemble_allocation_options
 
 
 # This script will be started on the remote node (by the batch scheduler)
-BATCH_SCRIPT="${SCRIPT_DIR}/../libexec/mcms_interactive_batch_script"
+BATCH_SCRIPT="${SCRIPT_DIR}/../libexec/microway/interactive_batch_script"
 
 # This script will be called by SSH (to connect the user to their session)
-CONNECTION_SCRIPT="${SCRIPT_DIR}/../libexec/mcms_interactive_connection_script"
+CONNECTION_SCRIPT="${SCRIPT_DIR}/../libexec/microway/interactive_connection_script"
 
 
 

etc/microway/mcms_interactive_session.conf renamed to etc/microway/interactive_session.conf

@@ -54,7 +54,7 @@ if [[ -z "$SLURM_JOB_ID" ]]; then
 fi
 
 
-SCREEN_RC=/etc/microway/mcms_interactive_screenrc.conf
+SCREEN_RC=/etc/microway/interactive_screenrc.conf
 
 if [[ ! -r "${SCREEN_RC}" ]]; then
     echo "Unable to locate the necessary screenrc file:"

usr/bin/mcms_interactive_session renamed to usr/bin/interactive_session

@@ -16,7 +16,7 @@
 #
 #
 # Modified scripts (with bugfixes and additional feature support):
-#   Copyright (C) 2015 Microway, Inc. All rights reserved.
+#   Copyright (C) 2015-2016 Microway, Inc. All rights reserved.
 #   http://www.microway.com
 #
 #
@@ -39,8 +39,11 @@
 ################################################################################
 #
 # This script connects a user to their existing screen session (which is started
-# by the mcms_interactive_session utility). That script will SSH into the node
-# that has been reserved by SLURM and run this script.
+# by the interactive_session utility). That interactive_session script will SSH
+# into the node that has been reserved by SLURM and run this script.
+#
+# In this script, we set up the X11 session (if there is one), start up a 'top'
+# monitoring tool and connect the user to the seesion.
 #
 ################################################################################
 
@@ -54,8 +57,6 @@ fi
 
 SCREENSESSION="$2"
 
-SCRIPT_DIR="$( dirname "$( readlink -f "${BASH_SOURCE[0]}" )" )"
-
 
 # There is a possible race condition here. If the job has just started, we
 # might be trying to connect to the screen session before it has finished
@@ -97,7 +98,7 @@ fi
 screen -S "$SCREENSESSION" -X screen -t "bash" 1 bash -i -l
 
 # Start up a splash screen with a welcome message
-screen -S "$SCREENSESSION" -X screen -t "Help" 2 ${SCRIPT_DIR}/../libexec/mcms_interactive_splash
+screen -S "$SCREENSESSION" -X screen -t "Help" 2 /usr/libexec/microway/interactive_splash
 
 # Remove the META tab, which has outlived its usefulness
 screen -p0 -S "$SCREENSESSION" -X kill