diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-28 09:34:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-28 09:34:41 +0100 |
commit | 8a8a73701d4fbf94f6299bde239b9392177c9858 (patch) | |
tree | d941c6c271dca23698af0f65a0c020e61e4cce6c /pkgs/build-support | |
parent | 6f7ded7e77756c33cdfc45982b98582dfe424fe1 (diff) | |
parent | d12cab3bb185ebe62b366fe36aca50ec085dbdee (diff) |
Merge pull request #37928 from VShell/patch-2
buildRustCrate: fix equality testing
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/rust/build-rust-crate.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index 8a9a07fd7a8ff..b07a09d635597 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -19,7 +19,7 @@ let makeDeps = dependencies: echo_build_heading() { start="" end="" - if [[ x"${colors}" -eq x"always" ]]; then + if [[ "${colors}" == "always" ]]; then start="$(printf '\033[0;1;32m')" #set bold, and set green. end="$(printf '\033[0m')" #returns to "normal" fi @@ -34,7 +34,7 @@ let makeDeps = dependencies: noisily() { start="" end="" - if [[ x"${colors}" -eq x"always" ]]; then + if [[ "${colors}" == "always" ]]; then start="$(printf '\033[0;1;32m')" #set bold, and set green. end="$(printf '\033[0m')" #returns to "normal" fi @@ -194,7 +194,7 @@ let makeDeps = dependencies: bold="" green="" boldgreen="" - if [[ "${colors}" -eq "always" ]]; then + if [[ "${colors}" == "always" ]]; then norm="$(printf '\033[0m')" #returns to "normal" bold="$(printf '\033[0;1m')" #set bold green="$(printf '\033[0;32m')" #set green @@ -230,7 +230,7 @@ let makeDeps = dependencies: ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ $LINK ${deps}$EXTRA_LIB --cap-lints allow \ $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} - if [ "$crate_name_" -ne "$crate_name" ]; then + if [ "$crate_name_" != "$crate_name" ]; then mv target/bin/$crate_name_ target/bin/$crate_name fi } |