restore linefeed at end of st.cmd

epics-containers · Mar 8, 2023 · e5777b4 · e5777b4
1 parent 5286b1d
commit e5777b4
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 4 deletions.
diff --git a/ibek-defs b/ibek-defs
diff --git a/src/ibek/templates/st.cmd.jinja b/src/ibek/templates/st.cmd.jinja
@@ -18,6 +18,6 @@ ioc_registerRecordDeviceDriver(pdbbase)
 dbLoadRecords("/tmp/ioc.db")
 iocInit()
 
-{%- if post_ioc_init_elements %}
+{% if post_ioc_init_elements %}
 {{ post_ioc_init_elements }}
 {% endif %}
diff --git a/tests/samples/boot_scripts/st.cmd b/tests/samples/boot_scripts/st.cmd
@@ -11,4 +11,5 @@ pmacCreateAxes(BL45P-MO-BRICK-01, 8)
 
 
 dbLoadRecords("/tmp/ioc.db")
-iocInit()
+iocInit()
+
diff --git a/tests/samples/boot_scripts/stbl45p-mo-ioc-03 b/tests/samples/boot_scripts/stbl45p-mo-ioc-03
@@ -14,4 +14,5 @@ for generating the necessary script
 
 
 dbLoadRecords("/tmp/ioc.db")
-iocInit()
+iocInit()
+
diff --git a/tests/samples/boot_scripts/stbl45p-mo-ioc-04 b/tests/samples/boot_scripts/stbl45p-mo-ioc-04
@@ -9,5 +9,7 @@ ioc_registerRecordDeviceDriver(pdbbase)
 
 dbLoadRecords("/tmp/ioc.db")
 iocInit()
+
+
 dbpf "BL45P-MO-THIN-01:Y1.TWV", "0.5"
 
diff --git a/tests/samples/schemas/bl45p-mo-ioc-04.ibek.entities.schema.json b/tests/samples/schemas/bl45p-mo-ioc-04.ibek.entities.schema.json
@@ -107,6 +107,50 @@
             ],
             "additionalProperties": false
           },
+          {
+            "type": "object",
+            "properties": {
+              "entity_enabled": {
+                "type": "boolean",
+                "default": true
+              },
+              "command": {
+                "type": "string",
+                "description": "An arbitrary command in the startup script before iocInit"
+              },
+              "type": {
+                "type": "string",
+                "const": "epics.startupCommand",
+                "default": "epics.startupCommand"
+              }
+            },
+            "required": [
+              "command"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "entity_enabled": {
+                "type": "boolean",
+                "default": true
+              },
+              "command": {
+                "type": "string",
+                "description": "An arbitrary command in the startup script after iocInit"
+              },
+              "type": {
+                "type": "string",
+                "const": "epics.postStartupCommand",
+                "default": "epics.postStartupCommand"
+              }
+            },
+            "required": [
+              "command"
+            ],
+            "additionalProperties": false
+          },
           {
             "type": "object",
             "properties": {

diff --git a/tests/samples/schemas/epics.ibek.support.schema.json b/tests/samples/schemas/epics.ibek.support.schema.json
@@ -106,6 +106,50 @@
               "value"
             ],
             "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "entity_enabled": {
+                "type": "boolean",
+                "default": true
+              },
+              "command": {
+                "type": "string",
+                "description": "An arbitrary command in the startup script before iocInit"
+              },
+              "type": {
+                "type": "string",
+                "const": "epics.startupCommand",
+                "default": "epics.startupCommand"
+              }
+            },
+            "required": [
+              "command"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "entity_enabled": {
+                "type": "boolean",
+                "default": true
+              },
+              "command": {
+                "type": "string",
+                "description": "An arbitrary command in the startup script after iocInit"
+              },
+              "type": {
+                "type": "string",
+                "const": "epics.postStartupCommand",
+                "default": "epics.postStartupCommand"
+              }
+            },
+            "required": [
+              "command"
+            ],
+            "additionalProperties": false
           }
         ]
       },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,5 @@ pmacCreateAxes(BL45P-MO-BRICK-01, 8)


		dbLoadRecords("/tmp/ioc.db")
		iocInit()
		iocInit()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,5 @@ for generating the necessary script


		dbLoadRecords("/tmp/ioc.db")
		iocInit()
		iocInit()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,5 +9,7 @@ ioc_registerRecordDeviceDriver(pdbbase)

		dbLoadRecords("/tmp/ioc.db")
		iocInit()


		dbpf "BL45P-MO-THIN-01:Y1.TWV", "0.5"