Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ESS EPICS Environment
wrappers
e3-require
Commits
baa44f5d
Commit
baa44f5d
authored
4 years ago
by
Simon Rose
Browse files
Options
Downloads
Patches
Plain Diff
Some small cleanup
parent
ca701139
No related branches found
No related tags found
1 merge request
!28
E3-302: Quieter iocsh
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure/E3/RULES_REQUIRE
+0
-2
0 additions, 2 deletions
configure/E3/RULES_REQUIRE
require-ess/tools/iocsh_functions.bash
+3
-2
3 additions, 2 deletions
require-ess/tools/iocsh_functions.bash
with
3 additions
and
4 deletions
configure/E3/RULES_REQUIRE
+
0
−
2
View file @
baa44f5d
...
...
@@ -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/*))
...
...
This diff is collapsed.
Click to expand it.
require-ess/tools/iocsh_functions.bash
+
3
−
2
View file @
baa44f5d
#!/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
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment