public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/programs/shell.nix: Use [ ] instead of test

Browse Source 
Half of the script is using 'test' and other half '[ ]'. Let's stick to
'[ ]' everywhere as it seems more conventional in nixpkgs.
This commit is contained in:
Tuomas Tynkkynen 2018-05-20 16:48:13 +03:00
parent 7adae10a86
commit 3cfb492c63
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/programs/shell.nix
View File

@ -24,13 +24,13 @@ in
'' ''
# Set up the per-user profile. # Set up the per-user profile.
mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR" 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 echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
fi fi
if test -w "$HOME"; then if [ -w "$HOME" ]; then
if ! test -L "$HOME/.nix-profile"; then if ! [ -L "$HOME/.nix-profile" ]; then
if test "$USER" != root; then if [ "$USER" != root ]; then
ln -s "$NIX_USER_PROFILE_DIR/profile" "$HOME/.nix-profile" ln -s "$NIX_USER_PROFILE_DIR/profile" "$HOME/.nix-profile"
else else
# Root installs in the system-wide profile by default. # Root installs in the system-wide profile by default.
@ -46,7 +46,7 @@ in
# Create the per-user garbage collector roots directory. # Create the per-user garbage collector roots directory.
NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER" NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER"
mkdir -m 0755 -p "$NIX_USER_GCROOTS_DIR" 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 echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
fi fi