Changeset 4010

Timestamp:

May 21, 2020, 11:22:35 AM (5 years ago)

Author:

Andreas Schnellbacher

Message:

• Improved determination if EPM is running. The previous version always opened a new EPM window on install, if WarpIN was started with the NEPMD env.

File:

• trunk/src/netlabs/install/epmsp.cmd (modified) (4 diffs)

trunk/src/netlabs/install/epmsp.cmd ¶

@@ -157 +157 @@
    'CALL RXQUEUE /CLEAR'
    SAY 'Executing: 'Cmd
-   Cmd' |RXQUEUE /FIFO'
+   Cmd'|RXQUEUE /FIFO'
    LineStr.0 = 0
    DO l = 1 TO QUEUED()
@@ -203 +203 @@
    'CALL RXQUEUE /CLEAR'
    SAY 'Executing: 'Cmd
-   Cmd' |RXQUEUE /FIFO'
+   Cmd'|RXQUEUE /FIFO'
    LineStr.0 = 0
    DO l = 1 TO QUEUED()
@@ -257 +257 @@
          'CALL RXQUEUE /CLEAR'
          SAY 'Executing: 'Cmd
-         Cmd' |RXQUEUE /FIFO'
+         Cmd'|RXQUEUE /FIFO'
          LineStr.0 = 0
          DO l = 1 TO QUEUED()
@@ -280 +280 @@
       rc = ERROR.NO_ERROR
       /* If running in EPM, restart this window */
-      IF VALUE( 'NEPMD_NAME',, env) <> '' THEN
+      Cmd = 'pstat'
+      'CALL RXQUEUE /CLEAR'
+      SAY 'Executing: 'Cmd
+      Cmd'|RXQUEUE /FIFO'
+      fEpmRunning = 0
+      DO l = 1 TO QUEUED()
+         PULL LineStr
+         IF POS( '\EPM.EXE', LineStr) > 0 THEN
+         DO
+            fEpmRunning = 1
+            LEAVE
+         END
+      END
+
+      IF VALUE( 'NEPMD_NAME',, env) <> '' & fEpmRunning THEN
       DO
          SAY 'Restart...'