nixos-option: Improve error messages to avoid reporting internal location and traces.

2014-12-19 23:00:52 +01:00 · 2014-12-19 23:00:52 +01:00 · cd2f7ce9f9
commit cd2f7ce9f9
parent b2abfe54b3
1 changed files with 12 additions and 1 deletions
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@ -69,7 +69,18 @@ fi
 #############################

 evalNix(){
-  nix-instantiate - --eval-only "$@"
+  result=$(nix-instantiate - --eval-only "$@" 2>&1)
+  if test $? -eq 0; then
+      cat <<EOF
+$result
+EOF
+      return 0;
+  else
+      sed -n '/error/ { s/, at (string):[0-9]*:[0-9]*//; p; }' <<EOF
+$result
+EOF
+      return 1;
+  fi
 }

 evalAttr(){