about summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-18T13·49+0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-18T13·50+0100
commit5d064e2698506be601fd87a20fcfe975b879a1fe (patch)
tree57043595aedf7de812bd484e7b584411e0496e00 /scripts
parent35aad73bb6c2954f39c2e024d91fdfa41ec778bc (diff)
Add a test for the binary tarball installer
Diffstat (limited to 'scripts')
-rw-r--r--scripts/install-nix-from-closure.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/install-nix-from-closure.sh b/scripts/install-nix-from-closure.sh
index ef56149915b1..60ec1ea93219 100644
--- a/scripts/install-nix-from-closure.sh
+++ b/scripts/install-nix-from-closure.sh
@@ -17,7 +17,7 @@ if [ -z "$USER" ]; then
 fi
 
 if [ "$(id -u)" -eq 0 ]; then
-    echo "warning: installing Nix as root is not recommended" >&2
+    printf '\e[1;31mwarning: installing Nix as root is not supported by this script!\e[0m\n'
 fi
 
 echo "performing a single-user installation of Nix..." >&2
@@ -79,7 +79,9 @@ if ! $nix/bin/nix-channel --list | grep -q "^nixpkgs "; then
         $nix/bin/nix-channel --add http://nixos.org/channels/nixpkgs-unstable
     fi
 fi
-$nix/bin/nix-channel --update nixpkgs
+if [ -z "$_NIX_INSTALLER_TEST" ]; then
+    $nix/bin/nix-channel --update nixpkgs
+fi
 
 # Install an SSL certificate bundle.
 $nix/bin/nix-env -iA nixpkgs.cacert || true