Use singular form for folders

README.md

@@ -117,27 +117,27 @@ target_link_libraries(application ftp::ftp)
 Build and run tests:
 
 ```
-utils/windows/build.ps1 [-BuildType Debug|Release] [-RunTest]
+util/windows/build.ps1 [-BuildType Debug|Release] [-RunTest]
 ```
 
 Clean the builds:
 
 ```
-utils/windows/clean.ps1
+util/windows/clean.ps1
 ```
 
 ### Linux/macOS
 
 Build and run tests:
 
 ```
-utils/unix/build.sh [--debug | --release] [--test]
+util/unix/build.sh [--debug | --release] [--test]
 ```
 
 Clean the builds:
 
 ```
-utils/unix/clean.sh
+util/unix/clean.sh
 ```
 
 ### Custom environment

utils/unix/build.sh → util/unix/build.sh

@@ -22,9 +22,9 @@ function parse_argument
 }
 
 SCRIPT_PATH=$(readlink -f "$0")
-UTILS_UNIX_DIR=$(dirname "$SCRIPT_PATH")
-UTILS_DIR=$(dirname "$UTILS_UNIX_DIR")
-PROJECT_DIR=$(dirname "$UTILS_DIR")
+UTIL_UNIX_DIR=$(dirname "$SCRIPT_PATH")
+UTIL_DIR=$(dirname "$UTIL_UNIX_DIR")
+PROJECT_DIR=$(dirname "$UTIL_DIR")
 
 BUILD_TYPE=Release
 BUILD_DIR=${PROJECT_DIR}/build/release

util/unix/clean.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+SCRIPT_PATH=$(readlink -f "$0")
+UTIL_UNIX_DIR=$(dirname "$SCRIPT_PATH")
+UTIL_DIR=$(dirname "$UTIL_UNIX_DIR")
+PROJECT_DIR=$(dirname "$UTIL_DIR")
+
+rm -rf "${PROJECT_DIR}/build"

utils/windows/build.ps1 → util/windows/build.ps1

@@ -9,9 +9,9 @@ function Get-Directory
 }
 
 $scriptPath = $PSCommandPath
-$utilsWinDir = Get-Directory($scriptPath)
-$utilsDir = Get-Directory($utilsWinDir)
-$projectDir = Get-Directory($utilsDir)
+$utilWinDir = Get-Directory($scriptPath)
+$utilDir = Get-Directory($utilWinDir)
+$projectDir = Get-Directory($utilDir)
 $buildDir = Join-Path $projectDir "build"
 
 if (-not (Test-Path $buildDir))

utils/windows/clean.ps1 → util/windows/clean.ps1

@@ -6,9 +6,9 @@ function Get-Directory
 }
 
 $scriptPath = $PSCommandPath
-$utilsWinDir = Get-Directory($scriptPath)
-$utilsDir = Get-Directory($utilsWinDir)
-$projectDir = Get-Directory($utilsDir)
+$utilWinDir = Get-Directory($scriptPath)
+$utilDir = Get-Directory($utilWinDir)
+$projectDir = Get-Directory($utilDir)
 $buildDir = Join-Path $projectDir "build"
 
 if (Test-Path $buildDir)