diff options
author | Robert Helgesson <robert@rycee.net> | 2017-09-06 23:44:58 +0200 |
---|---|---|
committer | Robert Helgesson <robert@rycee.net> | 2017-09-06 23:44:58 +0200 |
commit | ad1eee7aa549c3294f48379e82b40e7f69036a6f (patch) | |
tree | 22eb8339b4dc739d4a65968c55b3929827eb86b2 /home-manager | |
parent | 9c1b3735b402346533449efc741f191d6ef578dd (diff) |
home-manager: minor news build cleanups
- Rename the build function.
- Specify the built attribute in the build function.
- Make the news build silent.
Diffstat (limited to 'home-manager')
-rw-r--r-- | home-manager/home-manager | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/home-manager/home-manager b/home-manager/home-manager index 4722d41a2f8..329dd8d5cbe 100644 --- a/home-manager/home-manager +++ b/home-manager/home-manager @@ -75,7 +75,7 @@ function doBuildAttr() { function presentNews() { local infoFile - infoFile=$(doBuildNews -A newsInfo) || return 1 + infoFile=$(buildNews) || return 1 # shellcheck source=/dev/null . "$infoFile" @@ -170,8 +170,15 @@ function newsReadIdsFile() { echo "$path" } -function doBuildNews() { - doBuildAttr "$*" \ +# Builds news meta information to be sourced into this script. +# +# Note, we suppress build output to remove unnecessary verbosity. We +# also use "no out link" to avoid the need for a build directory +# (although this exposes the risk of GC removing the result before we +# manage to source it). +function buildNews() { + doBuildAttr --quiet \ + --attr newsInfo \ --no-out-link \ --arg check false \ --argstr newsReadIdsFile "$(newsReadIdsFile)" @@ -179,7 +186,7 @@ function doBuildNews() { function doShowNews() { local infoFile - infoFile=$(doBuildNews -A newsInfo) || return 1 + infoFile=$(buildNews) || return 1 # shellcheck source=/dev/null . "$infoFile" |