From 3cfb492c630ef51967f9c5066a806f318cc2b06b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 20 May 2018 16:48:13 +0300 Subject: [PATCH] nixos/programs/shell.nix: Use [ ] instead of test Half of the script is using 'test' and other half '[ ]'. Let's stick to '[ ]' everywhere as it seems more conventional in nixpkgs. --- nixos/modules/programs/shell.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix index d2928a0e6b1..579631c425c 100644 --- a/nixos/modules/programs/shell.nix +++ b/nixos/modules/programs/shell.nix @@ -24,13 +24,13 @@ in '' # Set up the per-user profile. mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR" - if test "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)"; then + if [ "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)" ]; then echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2 fi - if test -w "$HOME"; then - if ! test -L "$HOME/.nix-profile"; then - if test "$USER" != root; then + if [ -w "$HOME" ]; then + if ! [ -L "$HOME/.nix-profile" ]; then + if [ "$USER" != root ]; then ln -s "$NIX_USER_PROFILE_DIR/profile" "$HOME/.nix-profile" else # Root installs in the system-wide profile by default. @@ -46,7 +46,7 @@ in # Create the per-user garbage collector roots directory. NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER" mkdir -m 0755 -p "$NIX_USER_GCROOTS_DIR" - if test "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)"; then + if [ "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)" ]; then echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2 fi