Skip to content

Commit

Permalink
Merge pull request #166 from l0b0/refactor/linting
Browse files Browse the repository at this point in the history
refactor: Linting
  • Loading branch information
domenkozar authored Mar 9, 2023
2 parents 29bd929 + 3bdded0 commit be4cef7
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions install-nix.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
set -euo pipefail

if type -p nix &>/dev/null ; then
echo "Aborting: Nix is already installed at $(type -p nix)"
if nix_path="$(type -p nix)" ; then
echo "Aborting: Nix is already installed at ${nix_path}"
exit
fi

Expand All @@ -15,7 +15,7 @@ trap 'rm -rf "$workdir"' EXIT

# Configure Nix
add_config() {
echo "$1" | tee -a "$workdir/nix.conf" >/dev/null
echo "$1" >> "$workdir/nix.conf"
}
# Set jobs to number of cores
add_config "max-jobs = auto"
Expand All @@ -28,7 +28,7 @@ elif [[ -n "${GITHUB_TOKEN:-}" ]]; then
add_config "access-tokens = github.com=$GITHUB_TOKEN"
fi
# Append extra nix configuration if provided
if [[ $INPUT_EXTRA_NIX_CONFIG != "" ]]; then
if [[ -n "${INPUT_EXTRA_NIX_CONFIG:-}" ]]; then
add_config "$INPUT_EXTRA_NIX_CONFIG"
fi
if [[ ! $INPUT_EXTRA_NIX_CONFIG =~ "experimental-features" ]]; then
Expand All @@ -54,10 +54,10 @@ else
add_config "build-users-group ="
sudo mkdir -p /etc/nix
sudo chmod 0755 /etc/nix
sudo cp $workdir/nix.conf /etc/nix/nix.conf
sudo cp "$workdir/nix.conf" /etc/nix/nix.conf
fi

if [[ $INPUT_INSTALL_OPTIONS != "" ]]; then
if [[ -n "${INPUT_INSTALL_OPTIONS:-}" ]]; then
IFS=' ' read -r -a extra_installer_options <<< "$INPUT_INSTALL_OPTIONS"
installer_options=("${extra_installer_options[@]}" "${installer_options[@]}")
fi
Expand Down Expand Up @@ -91,7 +91,7 @@ echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
# new path for nix 2.14
echo "$HOME/.nix-profile/bin" >> "$GITHUB_PATH"

if [[ $INPUT_NIX_PATH != "" ]]; then
if [[ -n "${INPUT_NIX_PATH:-}" ]]; then
echo "NIX_PATH=${INPUT_NIX_PATH}" >> "$GITHUB_ENV"
fi

Expand Down

0 comments on commit be4cef7

Please sign in to comment.