mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-31 04:04:45 +00:00
Code Activity

bootstrap: remove set -e

Browse source
This commit is contained in:
Daiderd Jordan 2017-06-04 13:06:37 +02:00
parent 1cb24dfc4c
commit 0ef2374531
No known key found for this signature in database
GPG key ID: D02435D05B810C96
1 changed files with 15 additions and 13 deletions

28
bootstrap.sh
View file

@ -1,5 +1,4 @@
#! /usr/bin/env bash #! /usr/bin/env bash
set -e
set -o pipefail set -o pipefail
{ # Prevent execution if this script was only partially downloaded { # Prevent execution if this script was only partially downloaded
@ -139,7 +138,7 @@ install(){
case $ANSWER in case $ANSWER in
y|Y) y|Y)
echo "Proceeding with upgrade..." echo "Proceeding with upgrade..."
nix-env -iA nixpkgs.nix nix-env -iA nixpkgs.nix || exit
break break
;; ;;
n|N) n|N)
@ -151,33 +150,36 @@ install(){
esac esac
done done
sudo_prompt sudo_prompt || exit
# Link run directory # Link run directory
echo "Setting up /run..." echo "Setting up /run..."
test -L /run || sudo ln -snf private/var/run /run if ! test -L /run; then
sudo ln -sfn private/var/run /run || exit
fi
# Fetch the nix-darwin repo # Fetch the nix-darwin repo
echo -e ""$YELLOW"Configuring darwin channel..."$ESC"" echo -e ""$YELLOW"Configuring darwin channel..."$ESC""
nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin || exit
nix-channel --update nix-channel --update || exit
# Create symlink for old NIX_PATH entry # Create symlink for old NIX_PATH entry
ln -sfn "/nix/var/nix/profiles/per-user/$USER/channels/darwin" "$HOME/.nix-defexpr/darwin" ln -sfn "/nix/var/nix/profiles/per-user/$USER/channels/darwin" "$HOME/.nix-defexpr/darwin" || exit
# Copy the example configuration # Copy the example configuration
echo -e "Copying example configuration to "$YELLOW"~/.nixpkgs/darwin-configuration.nix"$ESC"..." echo -e "Copying example configuration to "$YELLOW"~/.nixpkgs/darwin-configuration.nix"$ESC"..."
if [ ! -e "$HOME/.nixpkgs/darwin-configuration.nix" ]; then if [ ! -e "$HOME/.nixpkgs/darwin-configuration.nix" ]; then
mkdir -p "$HOME/.nixpkgs" mkdir -p "$HOME/.nixpkgs" || exit
cp "$HOME/.nix-defexpr/darwin/modules/examples/simple.nix" "$HOME/.nixpkgs/darwin-configuration.nix" cp "$HOME/.nix-defexpr/darwin/modules/examples/simple.nix" "$HOME/.nixpkgs/darwin-configuration.nix" || exit
chmod u+w "$HOME/.nixpkgs/darwin-configuration.nix" chmod u+w "$HOME/.nixpkgs/darwin-configuration.nix" || exit
fi fi
# Bootstrap build using default nix.nixPath # Bootstrap build using default nix.nixPath
echo "Bootstrapping..." echo "Bootstrapping..."
export NIX_PATH=darwin=$HOME/.nix-defexpr/darwin:darwin-config=$HOME/.nixpkgs/darwin-configuration.nix:$NIX_PATH export NIX_PATH=darwin=$HOME/.nix-defexpr/darwin:darwin-config=$HOME/.nixpkgs/darwin-configuration.nix:$NIX_PATH
$(nix-build '<darwin>' -A system --no-out-link)/sw/bin/darwin-rebuild build $(nix-build '<darwin>' -A system --no-out-link)/sw/bin/darwin-rebuild build || exit
$(nix-build '<darwin>' -A system --no-out-link)/sw/bin/darwin-rebuild switch $(nix-build '<darwin>' -A system --no-out-link)/sw/bin/darwin-rebuild switch || exit
# Source generated bashrc # Source generated bashrc
. /etc/static/bashrc . /etc/static/bashrc
@ -198,7 +200,7 @@ install(){
read -p "Would you like to create the Nix daemon group/users? [y/n] " ANSWER read -p "Would you like to create the Nix daemon group/users? [y/n] " ANSWER
case $ANSWER in case $ANSWER in
y|Y) y|Y)
create_daemon_users create_daemon_users || exit
break break
;; ;;
n|N) n|N)