Try env-style settings

* Add act support

* Unwhoops

* Better format bash

* Relocate some code

* Mac doesn't want to get fancy with mktemp

* Change branch

* Change to a pr instead of branch

* Use the pr all over

* Use main

* Don't cat the conf

* Improve act support

* Bash eval fix

* use single quotes instead

* Fix mac planner name

* Fix quotes again

.github/workflows/ci.yml

@@ -17,16 +17,17 @@ jobs:
           logger: pretty
           log-directives: nix_installer=trace
           backtrace: full
+          nix-installer-branch: main
       - name: echo $PATH
         run: echo $PATH
       - name: Test `nix` with `$GITHUB_PATH`
         if: success() || failure()
         run: |
-          nix run nixpkgs#fortune
-          nix profile install nixpkgs#fortune
-          fortune
+          nix run nixpkgs#hello
+          nix profile install nixpkgs#hello
+          hello
           nix store gc
-          nix run nixpkgs#fortune
+          nix run nixpkgs#hello
       - name: Test bash
         run: nix-instantiate -E 'builtins.currentTime' --eval
         if: success() || failure()
@@ -41,14 +42,15 @@ jobs:
           logger: pretty
           log-directives: nix_installer=trace
           backtrace: full
+          nix-installer-branch: main
       - name: Test `nix` with `$GITHUB_PATH`
         if: success() || failure()
         run: |
-          nix run nixpkgs#fortune
-          nix profile install nixpkgs#fortune
-          fortune
+          nix run nixpkgs#hello
+          nix profile install nixpkgs#hello
+          hello
           nix store gc
-          nix run nixpkgs#fortune
+          nix run nixpkgs#hello
       - name: Reinstall Nix
         uses: ./
         with:
@@ -58,14 +60,15 @@ jobs:
           reinstall: true
           extra-conf: |
             use-sqlite-wal = true
+          nix-installer-branch: main
       - name: Test `nix` with `$GITHUB_PATH`
         if: success() || failure()
         run: |
-          nix run nixpkgs#fortune
-          nix profile install nixpkgs#fortune
-          fortune
+          nix run nixpkgs#hello
+          nix profile install nixpkgs#hello
+          hello
           nix store gc
-          nix run nixpkgs#fortune
+          nix run nixpkgs#hello
       - name: Verify the generated nix.conf
         run: |
           cat -n /etc/nix/nix.conf
@@ -83,16 +86,17 @@ jobs:
           logger: pretty
           log-directives: nix_installer=trace
           backtrace: full
+          nix-installer-branch: main
       - name: echo $PATH
         run: echo $PATH
       - name: Test `nix` with `$GITHUB_PATH`
         if: success() || failure()
         run: |
-          nix run nixpkgs#fortune
-          nix profile install nixpkgs#fortune
-          fortune
+          nix run nixpkgs#hello
+          nix profile install nixpkgs#hello
+          hello
           nix store gc
-          nix run nixpkgs#fortune
+          nix run nixpkgs#hello
       - name: Test bash
         run: nix-instantiate -E 'builtins.currentTime' --eval
         if: success() || failure()
@@ -111,14 +115,15 @@ jobs:
           logger: pretty
           log-directives: nix_installer=trace
           backtrace: full
+          nix-installer-branch: main
       - name: Test `nix` with `$GITHUB_PATH`
         if: success() || failure()
         run: |
-          nix run nixpkgs#fortune
-          nix profile install nixpkgs#fortune
-          fortune
+          nix run nixpkgs#hello
+          nix profile install nixpkgs#hello
+          hello
           nix store gc
-          nix run nixpkgs#fortune
+          nix run nixpkgs#hello
       - name: Reinstall Nix
         uses: ./
         with:
@@ -128,16 +133,17 @@ jobs:
           reinstall: true
           extra-conf: |
             use-sqlite-wal = true
+          nix-installer-branch: main
       - name: Test `nix` with `$GITHUB_PATH`
         if: success() || failure()
         run: |
-          nix run nixpkgs#fortune
-          nix profile install nixpkgs#fortune
-          fortune
+          nix run nixpkgs#hello
+          nix profile install nixpkgs#hello
+          hello
           nix store gc
-          nix run nixpkgs#fortune
+          nix run nixpkgs#hello
       - name: Verify the generated nix.conf
         run: |
-          cat -n /etc/nix/nix.conf
+          cat /etc/nix/nix.conf
           grep -E "^trusted-users = .*$USER" /etc/nix/nix.conf
           grep -E "^use-sqlite-wal = true" /etc/nix/nix.conf

README.md

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v2
+        uses: DeterminateSystems/nix-installer-action@v4
       - name: Run `nix build`
         run: nix build .
 ```

action.yml

@@ -103,10 +103,28 @@ runs:
   steps:
     - name: Install Nix
       shell: bash
+      env:
+        NIX_INSTALLER_MODIFY_PROFILE: ${{ inputs.modify-profile }}
+        NIX_INSTALLER_NIX_BUILD_USER_COUNT: ${{ inputs.nix-build-user-count }}
+        NIX_INSTALLER_NIX_BUILD_USER_ID_BASE: ${{ inputs.nix-build-user-base }}
+        NIX_INSTALLER_NIX_BUILD_USER_PREFIX: ${{ inputs.nix-build-user-prefix }}
+        NIX_INSTALLER_NIX_BUILD_GROUP_ID: ${{ inputs.nix-build-group-id }}
+        NIX_INSTALLER_NIX_BUILD_GROUP_NAME: ${{ inputs.nix-build-group-name }}
+        NIX_INSTALLER_ENCRYPT: ${{ inputs.mac-encrypt }}
+        NIX_INSTALLER_CASE_SENSITIVE: ${{ inputs.mac-case-sensitive }}
+        NIX_INSTALLER_VOLUME_LABEL: ${{ inputs.mac-volume-label }}
+        NIX_INSTALLER_ROOT_DISK: ${{ inputs.mac-root-disk }}
+        NIX_INSTALLER_LOGGER: ${{ inputs.logger }}
+        NIX_INSTALLER_INIT: ${{ inputs.init }}
+        NIX_INSTALLER_START_DAEMON: ${{ inputs.start-daemon }}
+        NIX_INSTALLER_LOG_DIRECTIVES: ${{ inputs.log-directives }}
+        RUST_BACKTRACE: ${{ inputs.backtrace }}
+        NIX_INSTALLER_DIAGNOSTIC_ENDPOINT: ${{ inputs.diagnostic-endpoint }}
+        NIX_INSTALLER_NO_CONFIRM: true
       run: |
         if [ -f "/nix/receipt.json" ] && [ -f "/nix/nix-installer" ]; then
           if ([ -n "${{ inputs.nix-installer-revision }}" ] || [ -n "${{ inputs.nix-installer-branch }}" ]) && [ "${{ inputs.reinstall }}" != "true" ]; then
-            echo "Detection of existing installation versions isn't supported when `nix-installer-revision` or `nix-installer-branch` are set, `reinstall: true` should also be set"
+            echo "Detection of existing installation versions isn't supported when \`nix-installer-revision\` or \`nix-installer-branch\` are set, \`reinstall: true\` should also be set"
           fi
 
           if [ -n "${{ inputs.reinstall }}" ] && [ "${{ inputs.reinstall }}" == "true" ]; then
@@ -119,38 +137,18 @@ runs:
             fi
             echo "Nix was already installed, using existing install"
             echo "/nix/var/nix/profiles/default/bin" >> $GITHUB_PATH
+            echo "$HOME/.nix-profile/bin" >> $GITHUB_PATH
             exit 0
           fi
         fi
 
-        if [ -n "${{ inputs.modify-profile }}" ]; then
-          export NIX_INSTALLER_MODIFY_PROFILE=${{ inputs.modify-profile }}
-          echo "Set NIX_INSTALLER_MODIFY_PROFILE=$NIX_INSTALLER_MODIFY_PROFILE"
-        fi
+        NIX_EXTRA_CONF_FILE=$(mktemp)
 
-        if [ -n "${{ inputs.nix-build-user-count }}" ]; then
-          export NIX_INSTALLER_NIX_BUILD_USER_COUNT=${{ inputs.nix-build-user-count }}
-          echo "Set NIX_INSTALLER_NIX_BUILD_USER_COUNT=$NIX_INSTALLER_NIX_BUILD_USER_COUNT"
-        fi
-
-        if [ -n "${{ inputs.nix-build-group-name }}" ]; then
-          export NIX_INSTALLER_NIX_BUILD_GROUP_NAME=${{ inputs.nix-build-group-name }}
-          echo "Set NIX_INSTALLER_NIX_BUILD_GROUP_NAME=$NIX_INSTALLER_NIX_BUILD_GROUP_NAME"
-        fi
-
-        if [ -n "${{ inputs.nix-build-group-id }}" ]; then
-          export NIX_INSTALLER_NIX_BUILD_GROUP_ID=${{ inputs.nix-build-group-id }}
-          echo "Set NIX_INSTALLER_NIX_BUILD_GROUP_ID=$NIX_INSTALLER_NIX_BUILD_GROUP_ID"
-        fi
-
-        if [ -n "${{ inputs.nix-build-user-prefix }}" ]; then
-          export NIX_INSTALLER_NIX_BUILD_USER_ID_BASE=${{ inputs.nix-build-user-prefix }}
-          echo "Set NIX_INSTALLER_NIX_BUILD_USER_ID_BASE=$NIX_INSTALLER_NIX_BUILD_USER_ID_BASE"
-        fi
-
-        if [ -n "${{ inputs.nix-build-user-base }}" ]; then
-          export NIX_INSTALLER_NIX_BUILD_USER_PREFIX=${{ inputs.nix-build-user-base }}
-          echo "Set NIX_INSTALLER_NIX_BUILD_USER_PREFIX=$NIX_INSTALLER_NIX_BUILD_USER_PREFIX"
+        if [ -n "$ACT" ] && [ ! -n "$NOT_ACT" ]; then
+          echo 'Detected `$ACT` environment, assuming this is a https://github.com/nektos/act created container, set `NOT_ACT=true` to override this. This will change the settings of the `init` as well as `extra-conf` to be compatible with `act`'
+          export NIX_INSTALLER_INIT="none"
+          echo "Set NIX_INSTALLER_INIT=$NIX_INSTALLER_INIT"
+          echo "sandbox = false" >> ${NIX_EXTRA_CONF_FILE}
         fi
 
         if [ -n "${{ inputs.nix-package-url }}" ]; then
@@ -158,43 +156,20 @@ runs:
           echo "Set NIX_INSTALLER_NIX_PACKAGE_URL=$NIX_INSTALLER_NIX_PACKAGE_URL"
         fi
 
-        NIX_EXTRA_CONF=""
-        NEWLINE='
-        '
         if [ -n "${{ inputs.extra-conf }}" ]; then
-          NIX_EXTRA_CONF="${{ inputs.extra-conf }}"
+          echo "${{ inputs.extra-conf }}" >> ${NIX_EXTRA_CONF_FILE}
         fi
         if [ -n "${{ inputs.github-token }}" ]; then
-          NIX_EXTRA_CONF="${NIX_EXTRA_CONF:+$NIX_EXTRA_CONF$NEWLINE}access-tokens = github.com=${{ inputs.github-token }}"
+          echo "access-tokens = github.com=${{ inputs.github-token }}" >> ${NIX_EXTRA_CONF_FILE}
         fi
         if [ "${{ inputs.trust-runner-user }}" == "true" ]; then
-          NIX_EXTRA_CONF="${NIX_EXTRA_CONF:+$NIX_EXTRA_CONF$NEWLINE}trusted-users = root $USER"
+          echo "trusted-users = root $USER" >> ${NIX_EXTRA_CONF_FILE}
         fi
-        if [ -n "$NIX_EXTRA_CONF" ]; then
-          export NIX_INSTALLER_EXTRA_CONF="$NIX_EXTRA_CONF"
+        if [ -n "$NIX_EXTRA_CONF_FILE" ]; then
+          export NIX_INSTALLER_EXTRA_CONF=$(cat ${NIX_EXTRA_CONF_FILE})
           echo "Set NIX_INSTALLER_EXTRA_CONF=$NIX_INSTALLER_EXTRA_CONF"
         fi
 
-        if [ -n "${{ inputs.mac-encrypt }}" ]; then
-          export NIX_INSTALLER_ENCRYPT=${{ inputs.mac-encrypt }}
-          echo "Set NIX_INSTALLER_ENCRYPT=$NIX_INSTALLER_ENCRYPT"
-        fi
-
-        if [ -n "${{ inputs.mac-case-sensitive }}" ]; then
-          export NIX_INSTALLER_CASE_SENSITIVE=${{ inputs.mac-case-sensitive }}
-          echo "Set NIX_INSTALLER_CASE_SENSITIVE=$NIX_INSTALLER_CASE_SENSITIVE"
-        fi
-
-        if [ -n "${{ inputs.mac-volume-label }}" ]; then
-          export NIX_INSTALLER_VOLUME_LABEL=${{ inputs.mac-volume-label }}
-          echo "Set NIX_INSTALLER_VOLUME_LABEL=$NIX_INSTALLER_VOLUME_LABEL"
-        fi
-
-        if [ -n "${{ inputs.mac-root-disk }}" ]; then
-          export NIX_INSTALLER_ROOT_DISK=${{ inputs.mac-root-disk }}
-          echo "Set NIX_INSTALLER_ROOT_DISK=$NIX_INSTALLER_ROOT_DISK"
-        fi
-
         if [ -n "${{ inputs.nix-installer-pr }}" ] && [ -n "${{ inputs.nix-installer-tag }}" ]; then
           echo "The nix-installer-pr and nix-installer-tag options conflict, please choose one"
           exit 1
@@ -254,57 +229,33 @@ runs:
           echo "Set NIX_INSTALLER_FORCE_ALLOW_HTTP=$NIX_INSTALLER_FORCE_ALLOW_HTTP"
         else
           if [ -n "${{ inputs.nix-installer-url }}" ]; then
-            export NIX_INSTALLER_URL=${{ inputs.nix-installer-url }}
+            export NIX_INSTALLER_URL="${{ inputs.nix-installer-url }}"
           else
             if [ -n "${{ inputs.nix-installer-pr }}" ]; then
-              export NIX_INSTALLER_URL=https://install.determinate.systems/nix/pr/${{ inputs.nix-installer-pr }}
+              export NIX_INSTALLER_URL="https://install.determinate.systems/nix/pr/${{ inputs.nix-installer-pr }}?ci=github"
             elif [ -n "${{ inputs.nix-installer-tag }}" ]; then
-              export NIX_INSTALLER_URL=https://install.determinate.systems/nix/tag/${{ inputs.nix-installer-tag }}
+              export NIX_INSTALLER_URL="https://install.determinate.systems/nix/tag/${{ inputs.nix-installer-tag }}?ci=github"
             elif [ -n "${{ inputs.nix-installer-revision }}" ]; then
-              export NIX_INSTALLER_URL=https://install.determinate.systems/nix/rev/${{ inputs.nix-installer-revision }}
+              export NIX_INSTALLER_URL="https://install.determinate.systems/nix/rev/${{ inputs.nix-installer-revision }}?ci=github"
             elif [ -n "${{ inputs.nix-installer-branch }}" ]; then
-              export NIX_INSTALLER_URL=https://install.determinate.systems/nix/branch/${{ inputs.nix-installer-branch }}
+              export NIX_INSTALLER_URL="https://install.determinate.systems/nix/branch/${{ inputs.nix-installer-branch }}?ci=github"
             else
-              export NIX_INSTALLER_URL=https://install.determinate.systems/nix
+              export NIX_INSTALLER_URL="https://install.determinate.systems/nix?ci=github"
             fi
           fi
           echo "Set NIX_INSTALLER_URL=$NIX_INSTALLER_URL"
         fi
 
-        if [ -n "${{ inputs.logger }}" ]; then
-          export NIX_INSTALLER_LOGGER=${{ inputs.logger }}
-          echo "Set NIX_INSTALLER_LOGGER=$NIX_INSTALLER_LOGGER"
+        if [ "${RUNNER_OS}" == "Linux" ]; then
+          export PLANNER="linux"
+        elif [ "${RUNNER_OS}" == "macOS" ]; then
+          export PLANNER="macos"
+        else
+          echo "${RUNNER_OS} not supported"
+          exit 1
         fi
 
-        if [ -n "${{ inputs.init }}" ]; then
-          export NIX_INSTALLER_INIT=${{ inputs.init }}
-          echo "Set NIX_INSTALLER_INIT=$NIX_INSTALLER_INIT"
-        fi
-
-        if [ -n "${{ inputs.start-daemon }}" ]; then
-          export NIX_INSTALLER_START_DAEMON=${{ inputs.start-daemon }}
-          echo "Set NIX_INSTALLER_START_DAEMON=$NIX_INSTALLER_START_DAEMON"
-        fi
-
-        if [ -n "${{ inputs.log-directives }}" ]; then
-          export NIX_INSTALLER_LOG_DIRECTIVES=${{ inputs.log-directives }}
-          echo "Set NIX_INSTALLER_LOG_DIRECTIVES=$NIX_INSTALLER_LOG_DIRECTIVES"
-        fi
-
-        if [ -n "${{ inputs.backtrace }}" ]; then
-          export RUST_BACKTRACE=${{ inputs.backtrace }}
-          echo "Set RUST_BACKTRACE=$RUST_BACKTRACE"
-        fi
-
-        if [ -n "${{ inputs.diagnostic-endpoint }}" ]; then
-          export NIX_INSTALLER_DIAGNOSTIC_ENDPOINT="${{ inputs.diagnostic-endpoint }}"
-          echo "Set NIX_INSTALLER_DIAGNOSTIC_ENDPOINT=$NIX_INSTALLER_DIAGNOSTIC_ENDPOINT"
-        fi
-
-        export NIX_INSTALLER_NO_CONFIRM=true
-        echo "Set NIX_INSTALLER_NO_CONFIRM=$NIX_INSTALLER_NO_CONFIRM"
-
-        curl --retry 20 -L $NIX_INSTALLER_URL | sh -s -- install ${{ inputs.planner }} ${{ inputs.extra-args }}
+        curl --retry 20 -L $NIX_INSTALLER_URL | sh -s -- install ${PLANNER} ${{ inputs.extra-args }}
 
         if [ -n "$HTTP_PID" ]; then
           kill $HTTP_PID