The build failed on the same issue #1546

I tested with the workaround still available.
I modifies the code to be more readable and tested without the
workaround this time :-(

Author: jantje

io.sloeber.core/src/io/sloeber/core/api/BoardDescription.java

@@ -1005,13 +1005,14 @@ private static Map<String, String> getEnvVarsHookBuild(Map<String, String> vars,
         }
         for (int numDigits = 1; numDigits <= 2; numDigits++) {
             String formatter = "%0" + Integer.toString(numDigits) + "d"; //$NON-NLS-1$ //$NON-NLS-2$
-            int counter = 1;
-            String hookVarName = hookName.replace(searchString, String.format(formatter, Integer.valueOf(counter)));
-            for (int curIndex = 1; curIndex < 10; curIndex++)
+            int max = 10;
+            for (int counter = 1; counter < max; counter++) {
+                String hookVarName = hookName.replace(searchString, String.format(formatter, Integer.valueOf(counter)));
                 if (null != vars.get(hookVarName)) { // $NON-NLS-1$
                     envVarString = envVarString + preSeparator + hookVarName + postSeparator;
-                    hookVarName = hookName.replace(searchString, String.format(formatter, Integer.valueOf(++counter)));
                 }
+            }
+            max = 100;
         }
         if (!envVarString.isEmpty()) {
             extraVars.put(varName, envVarString);