From baa44f5d7abb33c0e802905dfa379a8d313af169 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Thu, 15 Apr 2021 10:09:25 +0200
Subject: [PATCH] Some small cleanup
---
configure/E3/RULES_REQUIRE | 2 --
require-ess/tools/iocsh_functions.bash | 5 +++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/configure/E3/RULES_REQUIRE b/configure/E3/RULES_REQUIRE
index 4832a232..24c93285 100644
--- a/configure/E3/RULES_REQUIRE
+++ b/configure/E3/RULES_REQUIRE
@@ -15,9 +15,7 @@ E3_CONFIG_FILE := $(TOP)/tools/e3.cfg
E3_TEST_SCRIPT := $(TOP)/tools/test_installed_modules.sh
#
E3_SHELL_FILES := $(wildcard $(E3_MODULE_SRC_PATH)/tools/iocsh*.bash)
-#E3_IOC_CFG_FILES := $(E3_MODULE_SRC_PATH)/tools/iocsh_functions
E3_IOC_CFG_FILES += $(E3_ESSENVCFG_FILE)
-#E3_IOC_CFG_FILES += $(E3_CONFIG_FILE)
E3_IOC_CFG_FILES += $(E3_MODULE_SRC_PATH)/tools/setE3Env.bash
E3_IOC_CFG_FILES += $(E3_MODULE_SRC_PATH)/tools/promptE3Env.bash
E3_REQUIRE_CONF_FILES := $(filter-out $(FILE_FILTER), $(wildcard $(TOP)/configure/modules/*))
diff --git a/require-ess/tools/iocsh_functions.bash b/require-ess/tools/iocsh_functions.bash
index 304c930e..de1b7a18 100644
--- a/require-ess/tools/iocsh_functions.bash
+++ b/require-ess/tools/iocsh_functions.bash
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
# -*- mode: sh -*-
#
# Copyright (c) 2004 - 2017 Paul Scherrer Institute
@@ -494,7 +495,7 @@ function help() {
printf "Options:\n\n"
printf " -?, -h, --help Show this page and exit.\n"
printf " -v, --version Show version and exit.\n"
- printf " -e env_file, Load a given environment file 'env_file'.\n"
+ printf " -e 'env_file' Load a given environment file 'env_file'.\n"
printf " -c 'cmd args' Ioc shell command.\n"
printf " -l 'cell path' Run Ioc with a cell path.\n"
printf " -s 'prog m=v' Sequencer program (and arguments), run with 'seq'.\n"
@@ -502,7 +503,7 @@ function help() {
printf " -r module[,ver] Modue (optionally with version) loaded via 'require'.\n"
printf " -dg Run with debugger gdb.\n"
printf " -dv Run with valgrind.\n"
-
+ printf " -n Run with 'nice --10' (requires sudo).\n"
printf " @file More arguments are read from file.\n\n"
printf "Supported filetypes:\n\n"
printf " *.db, *.dbt, *.template loaded via 'dbLoadRecords'\n"
--
GitLab