From 5d064e2698506be601fd87a20fcfe975b879a1fe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Nov 2014 14:49:42 +0100 Subject: Add a test for the binary tarball installer --- scripts/install-nix-from-closure.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts') 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 -- cgit 1.4.1