From 1d85672d74a6d3c8d5eb07cb00eb43b7383a17b9 Mon Sep 17 00:00:00 2001 From: Jelle Besseling Date: Wed, 10 Mar 2021 22:52:23 +0100 Subject: [PATCH] Add readlink check (#44) --- deploy_nixos/nixos-instantiate.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/deploy_nixos/nixos-instantiate.sh b/deploy_nixos/nixos-instantiate.sh index 9c36440..e599ae2 100755 --- a/deploy_nixos/nixos-instantiate.sh +++ b/deploy_nixos/nixos-instantiate.sh @@ -21,8 +21,19 @@ command=(nix-instantiate --show-trace --expr ' inherit (builtins) currentSystem; }') +if readlink --version | grep GNU; then + readlink="readlink -f" +else + if command -v greadlink &> /dev/null; then + readlink="greadlink -f" + else + echo "Warning: symlinks not supported because readlink is non GNU" >&2 + readlink="realpath" + fi +fi + if [[ -f "$config" ]]; then - config=$(readlink -f "$config") + config=$($readlink "$config") command+=(--argstr configuration "$config") else command+=(--arg configuration "$config") @@ -37,7 +48,7 @@ if [[ -n "$nix_path" && "$nix_path" != "-" ]]; then fi # Changing directory -cd "$(readlink -f "$config_pwd")" +cd "$($readlink "$config_pwd")" # Instantiate echo "running (instantiating): ${NIX_PATH:+NIX_PATH=$NIX_PATH} ${command[*]@Q}" -A out_path >&2