mirror of
https://github.com/nix-community/disko
synced 2024-09-20 05:51:54 +00:00
use nom-build if available
Nicer progress bars etc
This commit is contained in:
parent
a949edef70
commit
fe064a6393
2 changed files with 18 additions and 2 deletions
10
disko
10
disko
|
@ -104,6 +104,14 @@ while [[ $# -gt 0 ]]; do
|
|||
shift
|
||||
done
|
||||
|
||||
nixBuild() {
|
||||
if command -v nom-build > /dev/null; then
|
||||
nom-build "$@"
|
||||
else
|
||||
nix-build "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
if ! { [[ $mode = "format" ]] || [[ $mode = "mount" ]] || [[ $mode = "disko" ]] || [[ $mode = "create" ]] || [[ $mode = "zap_create_mount" ]] ; }; then
|
||||
abort "mode must be either format, mount or disko"
|
||||
fi
|
||||
|
@ -131,7 +139,7 @@ else
|
|||
fi
|
||||
|
||||
# The "--impure" is still pure, as the path is within the nix store.
|
||||
script=$(nix-build "${libexec_dir}"/cli.nix \
|
||||
script=$(nixBuild "${libexec_dir}"/cli.nix \
|
||||
--no-out-link \
|
||||
--impure \
|
||||
--argstr mode "$mode" \
|
||||
|
|
|
@ -139,6 +139,14 @@ cleanupMountPoint() {
|
|||
rmdir "${mountPoint}"
|
||||
}
|
||||
|
||||
nixBuild() {
|
||||
if command -v nom-build > /dev/null; then
|
||||
nom-build "$@"
|
||||
else
|
||||
nix-build "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
main() {
|
||||
parseArgs "$@"
|
||||
|
||||
|
@ -168,7 +176,7 @@ main() {
|
|||
# shellcheck disable=SC2064
|
||||
trap "cleanupMountPoint ${escapeMountPoint}" EXIT
|
||||
|
||||
outputs=$(nix-build "${libexec_dir}"/install-cli.nix \
|
||||
outputs=$(nixBuild "${libexec_dir}"/install-cli.nix \
|
||||
"${nix_args[@]}" \
|
||||
--no-out-link \
|
||||
--impure \
|
||||
|
|
Loading…
Reference in a new issue