3 files changed, 29 insertions, 14 deletions
diff --git a/include/ocl/core/chunk_string.hpp b/include/ocl/core/chunk_string.hpp
index ccbc10a..c60b0a4 100644
--- a/include/ocl/core/chunk_string.hpp
+++ b/include/ocl/core/chunk_string.hpp
@@ -20,14 +20,17 @@ namespace ocl
 	template <typename char_type, std::size_t max_chunk_size>
 	class basic_chunk_string final
 	{
+	public:
+		using condition_type = bool;
+
 	private:
 		char_type	packed_chunks_[max_chunk_size] = {0};
 		std::size_t chunk_total_{};
 
-		bool bad_{false};
+		condition_type bad_{false};
 
 	public:
-		const bool& bad{bad_};
+		const condition_type& bad{bad_};
 
 		basic_chunk_string() = default;
 
@@ -53,9 +56,7 @@ namespace ocl
 			if (in == nullptr || bad_)
 				return *this;
 
-			const auto& sz = std::strlen(in);
-
-			this->operator+=(std::basic_string<char_type>(in, sz));
+			this->operator+=(std::basic_string<char_type>(in));
 
 			return *this;
 		}
diff --git a/include/ocl/core/includes.hpp b/include/ocl/core/config.hpp
index 8d94cc0..2ea1399 100644
--- a/include/ocl/core/includes.hpp
+++ b/include/ocl/core/config.hpp
@@ -7,16 +7,16 @@
 
 #pragma once
 
-#include <memory>
-#include <iostream>
-#include <string>
-
 #include <boost/config.hpp>
 #include <boost/core/nvp.hpp>
 #include <boost/core/demangle.hpp>
 #include <boost/core/null_deleter.hpp>
 #include <boost/container/allocator.hpp>
 
+#include <memory>
+#include <iostream>
+#include <string>
+
 namespace ocl
 {
 #ifdef OCL_USE_UTF8
diff --git a/make_dist_linux.sh b/make_dist_linux.sh
index 2432323..ab78915 100755
--- a/make_dist_linux.sh
+++ b/make_dist_linux.sh
@@ -1,17 +1,31 @@
 #! /bin/sh
 
-outputDir=dist/lib/
+outputDir=dist/include/ocl/
 
 mkdir -p $outputDir
+mkdir -p $outputDir'fix'
+mkdir -p $outputDir'io'
+mkdir -p $outputDir'except'
+mkdir -p $outputDir'core'
+mkdir -p $outputDir'logic'
+mkdir -p $outputDir'memory'
+mkdir -p $outputDir'net'
+mkdir -p $outputDir'simd'
+mkdir -p $outputDir'tests'
+mkdir -p $outputDir'utility'
+mkdir -p 'dist/tools'
+
+outputDirCmd=dist/
+outputDirTools=dist/
 
 for f in include/ocl/*/*.hpp; do
 baseName=`echo $f | cut -d "." -f 1`
-echo "RUN:" cp --parents $f.hpp $outputDir$baseName
-cp --parents $f.hpp $outputDir$baseName
+echo "RUN:" cp $f $outputDir$baseName
+cp $f $outputDirCmd$baseName
 done
 
 for f in tools/*.py; do
 baseName=`echo $f | cut -d "." -f 1`
-echo "RUN:" ditto $baseName.py $outputDir$baseName
-ditto $baseName.py $outputDir$baseName
+echo "RUN:" cp $baseName'.py' $outputDirTools$baseName
+cp $baseName'.py' $outputDirTools$baseName'.py'
 done