diff options
| author | Lawrence D'Oliveiro <from-blender@geek-central.gen.nz> | 2014-02-22 17:31:43 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-02-22 17:31:43 +0400 |
| commit | 554eca1c288ea5b6c02b7fb174bf20238918b809 (patch) | |
| tree | cca9c7d8f57e171860267f68c72a5e64257053d2 /build_files/build_environment | |
| parent | ea5090f8c039902dd4e68d7b70b838566060277f (diff) | |
Avoid UUOC in install_deps.sh
The file ##build_files/build_environment/install_deps.sh## contains the following line:
THREADS=`cat /proc/cpuinfo | grep processor | wc -l`
The command within the backticks is a [[ http://catb.org/jargon/html/U/UUOC.html | Useless Use Of Cat ]].
A more compact way of writing the same thing (saving two subprocesses) is
THREADS=`grep -c processor /proc/cpuinfo`
or (using POSIX-preferred command-substitution parentheses instead of backticks)
THREADS=$(grep -c processor /proc/cpuinfo)
But the most compact, and least Linux-specific, way is to use the ##nproc##(1) command from the [[ http://www.gnu.org/software/coreutils/manual/html_node/nproc-invocation.html | GNU coreutils package ]]:
THREADS=$(nproc)
Reviewers: sergey, mont29
Reviewed by: mont29
Differential Revision: https://developer.blender.org/D255
Diffstat (limited to 'build_files/build_environment')
| -rwxr-xr-x | build_files/build_environment/prepare_release_env.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/build_environment/prepare_release_env.sh b/build_files/build_environment/prepare_release_env.sh index 9889feadcd2..f003507b25f 100755 --- a/build_files/build_environment/prepare_release_env.sh +++ b/build_files/build_environment/prepare_release_env.sh @@ -60,7 +60,7 @@ AMD64_PATH="$ENV_PATH/buildbot_${DEBIAN_BRANCH}_x86_64" I686_PATH="$ENV_PATH/buildbot_${DEBIAN_BRANCH}_i686" SOURCES_PATH="$ENV_PATH/sources" -THREADS=`cat /proc/cpuinfo | grep cores | uniq | sed -e "s/.*: *\(.*\)/\\1/"` +THREADS=$(nproc) # Force vpx be installed from the backports VPX_V="1.0.0-2~bpo60+1" |