Changeset 2851

Timestamp:

Dec 28, 2017, 12:55:15 AM (7 years ago)

Author:

Andreas Schnellbacher

Message:

• Added FindTool function to be in sync with TOOLS.E.

File:

• trunk/src/netlabs/bin/colors.erx (modified) (6 diffs)

trunk/src/netlabs/bin/colors.erx ¶

@@ -119 +119 @@
 GlobalVars = GlobalVars 'PalTitlePrefix ObjectIdPrefix'
 GlobalVars = GlobalVars 'PalIndexList ColorList'
-GlobalVars = GlobalVars 'WorkDir TmpDir DllName'
+GlobalVars = GlobalVars 'WorkDir TmpDir DllName NepmdIni rc'
+/* rc was made global to allow functions return other values */
 /* -------------------------------------------- */
 
@@ -140 +141 @@
 DestDllDir    = UserDir'\dll'
 TmpDir        = UserDir'\tmp'  /* Better use a unique name in %TMP%? */
-
+NepmdIni = VALUE( 'NEPMD_USERDIR',, env)'\bin\NEPMD.INI' /* Full filename of NEPMD.INI */
 
 DO 1
@@ -614 +615 @@
 /* section in StdCfg or Remove it already before call to this func from */
 /* AddCfg array */
-
 SaveAddCfg: PROCEDURE EXPOSE (GlobalVars)
 
@@ -623 +623 @@
    /* Write new color cfg to TmpFile */
    DO 1
-      IF STREAM( TmpFile, 'C', 'QUERY EXIST') <> '' THEN
+      IF FileExist( TmpFile) THEN
          rcx = FileDelete( TmpFile)
       next = STREAM( TmpFile, 'C', 'OPEN WRITE')
@@ -660 +660 @@
       END
       next = STREAM( TmpFile, 'C', 'CLOSE')
-      IF STREAM( TmpFile, 'C', 'QUERY EXIST') = '' THEN
+      IF \FileExist( TmpFile) THEN
       DO
          rc = ERROR.WRITE_FAULT
@@ -1333 +1333 @@
 
 /* ----------------------------------------------------------------------- */
-FileExist: PROCEDURE
+FindTool: PROCEDURE EXPOSE (GlobalVars)
+   Exe        = ''
+   Parameters = ''
+   WorkingDir = ''
+   DefaultCmd = ''
+   ValidKeywords = 'Exe Parameters WorkingDir DefaultCmd'
+
+   FoundExe   = ''
+   fWpsEntry  = 0
+   do once = 1 to 1
+      Tool = Lower( ARG(1))
+      /* Allow for a space- or a semicolon-separated keyword list. */
+      /* Keywords are case-sensitive (camel-case).                 */
+      Keywords = STRIP( TRANSLATE( ARG(2), ' ', ';'))
+      /* Check keywords */
+      UnknownKeywords = ''
+      DO w = 1 TO WORDS( Keywords)
+         next = WORD( Keywords, w)
+         IF WORDPOS( next, ValidKeywords) = 0 THEN
+            UnknownKeywords = strip( UnknownKeywords next)
+      END
+      IF UnknownKeywords <> '' THEN
+      DO
+         ErrorMessage = 'FindTool: Unknown keyword(s) "'UnknownKeywords'" specified.'
+         rc = ERROR.INVALID_PARAMETER
+         RETURN ''
+      END
+
+      /* Check if key \ToolBaseName is defined */
+      /* This key can be used as a reference to another exe */
+      KeyPath = '\NEPMD\User\Tools\'Tool'\ToolBaseName'
+      CfgToolBaseName = Lower( SysIni( NepmdIni, 'RegKeys', KeyPath))
+      /* If not, take Tool instead */
+      IF CfgToolBaseName <> '' THEN
+         ToolBaseName = CfgToolBaseName
+      ELSE
+         ToolBaseName = Tool
+
+      /* Strip extension */
+      p2 = LASTPOS( '.exe', ToolBaseName)
+      IF p2 > 1 THEN
+         ToolBaseName = SUBSTR( ToolBaseName, 1, p2 - 1)
+
+      /* Refer to defined config key */
+      IF WORDPOS( ToolBaseName,'md5sum md5suml md5') THEN
+         ToolBaseName = 'md5'
+
+      /* Read entries from ini */
+      KeyPath = '\NEPMD\User\Tools\'ToolBaseName
+      Exe        = SysIni( NepmdIni, 'RegKeys', KeyPath'\Exe')
+      Parameters = SysIni( NepmdIni, 'RegKeys', Keypath'\Parameters')
+      WorkingDir = SysIni( NepmdIni, 'RegKeys', KeyPath'\WorkingDir')
+      DefaultCmd = SysIni( NepmdIni, 'RegKeys', KeyPath'\DefaultCmd')
+
+      /* Allow for specifying env vars in value */
+      Exe        = ResolveEnvVars( Exe)
+      WorkingDir = ResolveEnvVars( WorkingDir)
+
+      /* Use fallback value if config key isn't defined */
+      IF Exe = '' THEN
+         Exe = ToolBaseName'.exe'
+
+      /* Handle WPS and fully qualified filenames */
+      IF TRANSLATE( Exe) = 'WPS' THEN
+      DO
+         fWpsEntry = 1
+         leave
+      END
+      IF POS( ':\', Exe) | LEFT( Exe, 2) = '\\' THEN
+      DO
+         IF FileExist( Exe) THEN
+         DO
+            FoundExe = Exe
+            LEAVE
+         END
+      END
+
+      ToolList = Exe
+      PathEnvVarList = 'PATH EPMTOOLSPATH'
+      FoundExe = ''
+      DO w = 1 TO WORDS( PathEnvVarList)
+         CurPath = WORD( PathEnvVarList, w)
+         Rest = ToolList
+         DO FOREVER
+            IF Rest = '' THEN
+               LEAVE
+            PARSE VALUE Rest WITH FSpec';'Rest
+            FoundExe = SysSearchPath( CurPath, FSpec)
+            IF FoundExe <> '' THEN
+               LEAVE
+         END
+         IF FoundExe <> '' THEN
+            LEAVE
+      END
+
+   END
+
+   IF fWpsEntry THEN
+      SELECT
+         WHEN Tool = 'mail' THEN
+         DO
+            Exe        = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultMailExe')
+            Exe        = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultMailExe')
+            Parameters = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultMailParameters')
+            WorkingDir = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultMailWorkingDir')
+         END
+         WHEN Tool = 'news' THEN
+         DO
+            Exe        = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultNewsExe')
+            Parameters = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultNewsParameters')
+            WorkingDir = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultNewsWorkingDir')
+         END
+         WHEN Tool = 'ftp' THEN
+         DO
+            Exe        = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultFTPExe')
+            Parameters = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultFTPParameters')
+            WorkingDir = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultFTPWorkingDir')
+         END
+         WHEN Tool = 'irc' THEN
+         DO
+            Exe        = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultIRCExe')
+            Parameters = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultIRCParameters')
+            WorkingDir = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultIRCWorkingDir')
+         END
+      END
+      IF Tool = 'browser' | Exe = '' THEN
+      DO
+         Exe        = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultBrowserExe')
+         Parameters = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultParameters')
+         WorkingDir = SysIni( 'USER', 'WPURLDEFAULTSETTINGS', 'DefaultWorkingDir')
+      END
+      FoundExe = Exe
+   endif
+
+   RetString = ''
+   IF Keywords = '' THEN
+      RetString = FoundExe
+   ELSE
+   DO k = 1 to WORDS( Keywords)
+      Keyword = WORD( Keywords, k)
+      Val = ''
+      SELECT
+         WHEN Keyword = 'Exe' THEN
+            Val = FoundExe
+         WHEN Keyword = 'Parameters' THEN
+            Val = Parameters
+         WHEN Keyword = 'WorkingDir' THEN
+            Val = WorkingDir
+         WHEN Keyword = 'DefaultCmd' THEN
+            Val = DefaultCmd
+      END
+      RetString = RetString''Keyword'='Val';'
+   END
+   RETURN RetString
+
+/* ----------------------------------------------------------------------- */
+/* Resolves environment variables in a string. Keeps %...% string if env   */
+/* var isn't set. Additionally ?: is replaced with the boot drive. Returns */
+/* converted string.                                                       */
+/* To convert also '=', the proc parse_filename( filename) should be used. */
+/* It calls this proc as well.                                             */
+ResolveEnvVars: PROCEDURE EXPOSE (GlobalVars)
+   Spec = ARG(1)
+
+   startp = 1
+   DO FOREVER
+      p1 = POS( '%', Spec, startp)
+      IF p1 = 0 THEN
+         LEAVE
+      startp = p1 + 1
+      p2 = POS( '%', Spec, startp)
+      IF p2 = 0 THEN
+         LEAVE
+      LeftPart    = SUBSTR( Spec, 1, p1 - 1)
+      EnvVarName  = SUBSTR( Spec, p1 + 1, p2 - p1 - 1)
+      RightPart   = SUBSTR( Spec, p2 + 1)
+      EnvVarValue = Get_Env( EnvVarName)
+      /* Handle unset vars: keep %... or %...% string */
+      IF EnvVarValue = '' THEN
+         ITERATE
+      /* Value exists, replace %...% string and move startp */
+      startp = LENGTH( LeftPart) + LENGTH( EnvVarValue) + 1
+      Spec = LeftPart''EnvVarValue''RightPart
+   END
+
+   /* Replace ?: with bootdrive */
+   DO WHILE POS( '?:', Spec) > 0
+      PARSE VALUE Spec WITH LeftPart'?:'RightPart
+      BootDrive = GetBootDrive()
+      Spec = LeftPart''BootDrive''RightPart
+   END
+
+   RETURN Spec
+
+/* ----------------------------------------------------------------------- */
+LOWER: PROCEDURE EXPOSE (GlobalVars)
+
+   Lower = 'abcdefghijklmnopqrstuvwxyz„”'
+   Upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZŽ™š'
+
+   PARSE ARG String
+   RETURN( TRANSLATE( String, Lower, Upper))
+
+/* ----------------------------------------------------------------------- */
+FileExist: PROCEDURE EXPOSE (GlobalVars)
    PARSE ARG Filename
    IF FileName = '' THEN