Skip to content

Commit f20bced

Browse files
authored
Merge pull request #372 from nai1ka/master
Update the documentation
2 parents 764c60f + 4f7300f commit f20bced

File tree

3 files changed

+45
-5
lines changed

3 files changed

+45
-5
lines changed

Makefile

+1-4
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ export
6161
# Run a single step from ./steps
6262
define step
6363
set -e
64+
${LOCAL}/help/check-make.sh
6465
start=$$(date +%s%N)
6566
echo -e "\n\n\n+++ $(1) +++\n"
6667
source "$(LOCAL)/help/gnu-utils.sh"
@@ -102,10 +103,6 @@ clean:
102103
# Show some details about the environment we are running it
103104
# (this is mostly for debugging in Docker)
104105
env:
105-
if [[ "$(MAKE_VERSION)" =~ ^[1-3] ]]; then
106-
echo "Make must be 4+: $(MAKE_VERSION)"
107-
exit 1
108-
fi
109106
$(call step,env)
110107

111108
# Get the list of repos from GitHub and then create directories

help/check-make.sh

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/usr/bin/env bash
2+
# The MIT License (MIT)
3+
#
4+
# Copyright (c) 2021-2024 Yegor Bugayenko
5+
#
6+
# Permission is hereby granted, free of charge, to any person obtaining a copy
7+
# of this software and associated documentation files (the "Software"), to deal
8+
# in the Software without restriction, including without limitation the rights
9+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
# copies of the Software, and to permit persons to whom the Software is
11+
# furnished to do so, subject to the following conditions:
12+
#
13+
# The above copyright notice and this permission notice shall be included
14+
# in all copies or substantial portions of the Software.
15+
#
16+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
19+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
# SOFTWARE.
23+
24+
set -e
25+
set -o pipefail
26+
27+
make_version=$(make --version | head -n1 | cut -d' ' -f3)
28+
make_version_int=$(echo "${make_version}" | cut -d'.' -f1)
29+
30+
if [ "${make_version_int}" -lt 4 ]; then
31+
echo "Make version must be 4 or higher. Current: ${make_version}"
32+
if "${LOCAL}/help/is-macos.sh" ; then
33+
echo "Try to update it with \"brew install make\""
34+
if [ "$(uname -m)" = "arm64" ]; then
35+
echo "Make sure you have \"/opt/homebrew/opt/make/libexec/gnubin\" in your PATH"
36+
else
37+
echo "Make sure you have \"/usr/local/opt/make/libexec/gnubin\" in your PATH"
38+
fi
39+
else
40+
echo "Try to update it with \"sudo apt install make\""
41+
fi
42+
exit 1
43+
fi

steps/env.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ bash_version=${BASH_VERSINFO:-0}
3535
if [ "${bash_version}" -lt 5 ]; then
3636
"${SHELL}" --version
3737
ps -p $$
38-
echo "${SHELL} version is older than five: ${bash_version}"
38+
echo "${SHELL} version must be 5 or higher. Current ${SHELL} version: ${bash_version}"
3939
exit 1
4040
fi
4141

0 commit comments

Comments
 (0)