diff --git a/lib/default.nix b/lib/default.nix index bc9685b5..9bcdcf89 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -165,7 +165,10 @@ let local decision="" message_part "$1 [Yn] " read -k decision - echo "" + if [[ $decision != '\n' ]] + then + echo "" + fi [[ $decision != 'n' ]] } ''; diff --git a/test/postgres/root/flake.nix b/test/postgres/root/flake.nix index 2575bf33..6d6b286d 100644 --- a/test/postgres/root/flake.nix +++ b/test/postgres/root/flake.nix @@ -1,7 +1,7 @@ { description = "hix test project"; - inputs.hix.url = path:HIX; + inputs.hix.url = "path:HIX"; outputs = { hix, ... }: hix.lib.flake ({config, ...}: { @@ -15,7 +15,7 @@ env = "db"; command = '' sleep 5 - psql "host=localhost port=16032 user=test password=test dbname=test" -c 'select 1' + ${config.pkgs.postgresql}/bin/psql "host=localhost port=16032 user=test password=test dbname=test" -c 'select 1' ''; }; diff --git a/test/update-cli-version/test.nix b/test/update-cli-version/test.nix index 092b4229..4596c294 100644 --- a/test/update-cli-version/test.nix +++ b/test/update-cli-version/test.nix @@ -4,6 +4,8 @@ in { test = pkgs.writeText "update-cli-version-test" '' version='0.6.7' + git init -q + mkdir ops ${release.updateCliVersion} target='{ "version": "0.6.7",