Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

prelude.sh: better output, working url/rev check

Browse Source
This commit is contained in:
lassulus 2015-05-07 17:42:27 +02:00 committed by tv
parent d63b684d72
commit 77069f3651
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/prelude.sh
View File

@ -38,7 +38,7 @@ deploy() {(
git_url=$(nixpkgs_url $main) git_url=$(nixpkgs_url $main)
git_rev=$(nixpkgs_rev $main) git_rev=$(nixpkgs_rev $main)
if [ $git_url = '' ] || [ $git_rev = '' ]; then if [ "$git_url" = '' ] || [ "$git_rev" = '' ]; then
echo "specify nixpkgs.url and nixpkgs.rev in $main !" echo "specify nixpkgs.url and nixpkgs.rev in $main !"
exit 23 exit 23
fi fi
@ -233,7 +233,7 @@ nixpkgs_url() {
-I nixos-config="$1" \ -I nixos-config="$1" \
--eval \ --eval \
--json \ --json \
-E '(import <nixos-config> {config={}; pkgs={};}).nixpkgs.url' \ -E '(import <nixos-config> {config={}; pkgs={};}).nixpkgs.url' 2> /dev/null \
| jq -r . | jq -r .
} }
@ -243,7 +243,7 @@ nixpkgs_rev() {
-I nixos-config="$1" \ -I nixos-config="$1" \
--eval \ --eval \
--json \ --json \
-E '(import <nixos-config> {config={}; pkgs={};}).nixpkgs.rev' \ -E '(import <nixos-config> {config={}; pkgs={};}).nixpkgs.rev' 2> /dev/null \
| jq -r . 2> /dev/null | jq -r . 2> /dev/null
} }