diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-15 01:14:57 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-01-15 08:51:04 +0100 |
| commit | e2acb8f82a7de9a3353cfe54e9bf2dcb7f0a7db9 (patch) | |
| tree | 41f2a80aedeeb67035c18ef2079008a0bb966cda | |
| parent | bd220c453db7082d95f0415600453c34f510070f (diff) | |
uninstaller: run on travis
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | pkgs/darwin-uninstaller/configuration.nix | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 0535544..8c501e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,11 @@ matrix: - nix-build ./release.nix -I darwin=. -A examples.simple - nix-build ./release.nix -I darwin=. -A tests - yes | nix-shell -A installer + - yes | nix-shell -A uninstaller - os: osx osx_image: xcode7.3 # 10.11 script: - nix-build ./release.nix -I darwin=. -A examples.simple - nix-build ./release.nix -I darwin=. -A tests - yes | nix-shell -A installer + - yes | nix-shell -A uninstaller diff --git a/pkgs/darwin-uninstaller/configuration.nix b/pkgs/darwin-uninstaller/configuration.nix index a9d352c..ef8169e 100644 --- a/pkgs/darwin-uninstaller/configuration.nix +++ b/pkgs/darwin-uninstaller/configuration.nix @@ -21,9 +21,12 @@ with lib; system.activationScripts.postActivation.text = mkAfter '' if test -O /nix/store; then - sudo launchctl unload /Library/LaunchDaemons/org.nixos.nix-daemon.plist || true - sudo cp /nix/var/nix/profiles/default/Library/LaunchDaemons/org.nixos.nix-daemon.plist /Library/LaunchDaemons/org.nixos.nix-daemon.plist - sudo launchctl load /Library/LaunchDaemons/org.nixos.nix-daemon.plist + l=$(readlink /Library/LaunchDaemons/org.nixos.nix-daemon.plist) || true + if test "$l" != "/nix/var/nix/profiles/default/Library/LaunchDaemons/org.nixos.nix-daemon.plist"; then + sudo launchctl unload -w /Library/LaunchDaemons/org.nixos.nix-daemon.plist 2> /dev/null || true + sudo ln -sfn /nix/var/nix/profiles/default/Library/LaunchDaemons/org.nixos.nix-daemon.plist /Library/LaunchDaemons/org.nixos.nix-daemon.plist + sudo launchctl load -w /Library/LaunchDaemons/org.nixos.nix-daemon.plist + fi if ! grep -q etc/profile.d/nix-daemon.sh /etc/bashrc; then echo >&2 "Found no nix-daemon.sh reference in /etc/bashrc" |