From 92ac66c8403fc85b61561d89dc6a3580d578a422 Mon Sep 17 00:00:00 2001
From: deniskovalchuk <denis.kovalchuk.main@gmail.com>
Date: Thu, 14 Sep 2023 02:26:21 +0300
Subject: [PATCH] Use singular form for folders

---
 README.md                         | 8 ++++----
 {utils => util}/unix/build.sh     | 6 +++---
 util/unix/clean.sh                | 8 ++++++++
 {utils => util}/windows/build.ps1 | 6 +++---
 {utils => util}/windows/clean.ps1 | 6 +++---
 utils/unix/clean.sh               | 8 --------
 6 files changed, 21 insertions(+), 21 deletions(-)
 rename {utils => util}/unix/build.sh (88%)
 create mode 100755 util/unix/clean.sh
 rename {utils => util}/windows/build.ps1 (85%)
 rename {utils => util}/windows/clean.ps1 (67%)
 delete mode 100755 utils/unix/clean.sh

diff --git a/README.md b/README.md
index 7f4e4f3..eed8746 100644
--- a/README.md
+++ b/README.md
@@ -117,13 +117,13 @@ 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
@@ -131,13 +131,13 @@ utils/windows/clean.ps1
 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
diff --git a/utils/unix/build.sh b/util/unix/build.sh
similarity index 88%
rename from utils/unix/build.sh
rename to util/unix/build.sh
index 9034e34..51e0b75 100755
--- a/utils/unix/build.sh
+++ b/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
diff --git a/util/unix/clean.sh b/util/unix/clean.sh
new file mode 100755
index 0000000..7d21707
--- /dev/null
+++ b/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"
\ No newline at end of file
diff --git a/utils/windows/build.ps1 b/util/windows/build.ps1
similarity index 85%
rename from utils/windows/build.ps1
rename to util/windows/build.ps1
index 37e4087..ce58809 100644
--- a/utils/windows/build.ps1
+++ b/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))
diff --git a/utils/windows/clean.ps1 b/util/windows/clean.ps1
similarity index 67%
rename from utils/windows/clean.ps1
rename to util/windows/clean.ps1
index 17c057a..ef2b29a 100644
--- a/utils/windows/clean.ps1
+++ b/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)
diff --git a/utils/unix/clean.sh b/utils/unix/clean.sh
deleted file mode 100755
index 6063c30..0000000
--- a/utils/unix/clean.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-SCRIPT_PATH=$(readlink -f "$0")
-UTILS_UNIX_DIR=$(dirname "$SCRIPT_PATH")
-UTILS_DIR=$(dirname "$UTILS_UNIX_DIR")
-PROJECT_DIR=$(dirname "$UTILS_DIR")
-
-rm -rf "${PROJECT_DIR}/build"
\ No newline at end of file