Fix for fileutils list files

Author: rsahlin

graphics-by-opengl-j2se/src/main/java/com/nucleus/common/FileUtils.java

@@ -102,7 +102,7 @@ public ArrayList<String> listResourceFolders(String path) throws IOException, UR
     /**
      * List the files, based on mime, beginning at path and including the specified folders.
      * 
-     * @param path Base path to start file list
+     * @param path Base path to start file list - shall end with '/'
      * @param folders Folders to include in search
      * @param mimes File extensions to include
      * @return Matching files
@@ -120,6 +120,13 @@ public ArrayList<String> listFiles(String path, ArrayList<String> folders, final
                         .collect(Collectors.toList());
                 String listStr = listPath.toString().replace('\\', FileUtils.DIRECTORY_SEPARATOR);
                 int len = listStr.length();
+                if (path.endsWith("/")) {
+                    if (!listStr.endsWith("/")) {
+                        listStr = listStr + "/";
+                    }
+                } else if (listStr.endsWith("/")) {
+                    path = path + "/";
+                }
                 int relative = listStr.indexOf(path) + path.length();
                 if (relative < path.length()) {
                     throw new IllegalArgumentException("Could not find '" + path + "' in: " + listStr);

graphics-by-opengl-j2se/src/main/java/com/nucleus/vulkan/GLSLCompiler.java

@@ -94,7 +94,7 @@ public void compileStage(String path, ArrayList<String> folders, ByteBuffer buff
                         file.getPath().indexOf(folder.length() > 0 ? folder + "\\" + file.getName() : file.getName()));
                 name = filename.substring(0, filename.length() - (stage.name().length() + 1));
                 output = name + "_" + stage.name() + ".spv";
-                String cmd = "glslc " + filename + " -o - & echo " + SpirvBinary.SPIRV_END_MARKER;
+                String cmd = "glslc " + filename + " -o - && echo " + SpirvBinary.SPIRV_END_MARKER;
                 buffer.clear();
                 SpirvBinary binary = compile(new String[] { "cd " + filePath, cmd }, null, buffer);
                 if (binary == null) {