diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-25 15:11:11 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-25 00:04:22 +0200 |
commit | a8e4bf7554dc7219b23c0ff076321f62c24b2b82 (patch) | |
tree | 0f6f2512811374036e29d9c66e18fff1f20cadc1 /scripts/make-env | |
parent | 6afdbd8c052a347284772d6d7b2d90977f174018 (diff) | |
download | NUR-a8e4bf7554dc7219b23c0ff076321f62c24b2b82.tar.gz NUR-a8e4bf7554dc7219b23c0ff076321f62c24b2b82.tar.zst NUR-a8e4bf7554dc7219b23c0ff076321f62c24b2b82.zip |
Use Makefile for some env/deploy scripts
Diffstat (limited to 'scripts/make-env')
-rwxr-xr-x | scripts/make-env | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/make-env b/scripts/make-env index 983a3590..25aa869a 100755 --- a/scripts/make-env +++ b/scripts/make-env | |||
@@ -2,11 +2,11 @@ | |||
2 | 2 | ||
3 | DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" | 3 | DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" |
4 | 4 | ||
5 | source $DIR/nix_env | 5 | eval "$(make --no-print-directory -C $(dirname $DIR) nix-path)" |
6 | nix-env -r -i -A myEnvironments.immae-eu -f "<nixpkgs>" "$@" | 6 | nix-env -r -i -A myEnvironments.immae-eu -f "<nixpkgs>" "$@" |
7 | result=$? | 7 | result=$? |
8 | 8 | ||
9 | cat >> $(dirname $DIR)/versions_log <<EOF | 9 | cat >> $(dirname $DIR)/versions_log <<EOF |
10 | Ran $(date) with args "$@" and returned "$result" | 10 | Ran $(date) with args "$@" and returned "$result" |
11 | $($DIR/nix_infos | sed -e "s/^/ /") | 11 | $(make --no-print-directory -C $(dirname $DIR) nix-info | sed -e "s/^/ /") |
12 | EOF | 12 | EOF |