From f0e4aabb78ecd9b60385f67259f3cfd7ee9ae31c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 14 Jan 2018 01:53:57 +0100 Subject: [PATCH] bootstrap: remove profile patch --- bootstrap.sh | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 8b55d06..9d0235c 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -174,39 +174,6 @@ install(){ fi fi - if ! test -L /etc/profile && grep -q 'etc/profile.d/nix-daemon.sh' /etc/profile; then - while true; do - read -p "Would you like to remove nix-daemon.sh configuration in /etc/profile? [y/n] " i - case "$i" in - y|Y) - cat <<-'EOF' | sudo patch -d /etc -p1 || exit -diff --git a/profile b/profile -index 3748e3b..36ad2cd 100644 ---- a/profile -+++ b/profile -@@ -7,9 +7,3 @@ fi - if [ "${BASH-no}" != "no" ]; then - [ -r /etc/bashrc ] && . /etc/bashrc - fi -- --# Nix --if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then -- . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' --fi --# End Nix -EOF - break - ;; - n|N) - break - ;; - *) - echo "Please answer 'y' or 'n'..." - ;; - esac - done - fi - # Bootstrap build using default nix.nixPath echo "Bootstrapping..." export NIX_PATH=darwin=$HOME/.nix-defexpr/channels/darwin:darwin-config=$HOME/.nixpkgs/darwin-configuration.nix:$NIX_PATH