diff options
author | lassulus <lass@aidsballs.de> | 2015-05-07 17:42:27 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2015-05-19 23:17:20 +0200 |
commit | 38db85ed2e9e65c82f0e2713c7c10e5b412a75a1 (patch) | |
tree | 0bd5fe59a89bb0a421a48fc8d4fe0cbaa732ef42 | |
parent | dd07f4446c30f5e909a0375a24e96badf9f5cac4 (diff) |
prelude.sh: better output, working url/rev check
-rw-r--r-- | lib/prelude.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/prelude.sh b/lib/prelude.sh index 98cbea0..c68bf55 100644 --- a/lib/prelude.sh +++ b/lib/prelude.sh @@ -38,7 +38,7 @@ deploy() {( git_url=$(nixpkgs_url $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 !" exit 23 fi @@ -233,7 +233,7 @@ nixpkgs_url() { -I nixos-config="$1" \ --eval \ --json \ - -E '(import <nixos-config> {config={}; pkgs={};}).nixpkgs.url' \ + -E '(import <nixos-config> {config={}; pkgs={};}).nixpkgs.url' 2> /dev/null \ | jq -r . } @@ -243,7 +243,7 @@ nixpkgs_rev() { -I nixos-config="$1" \ --eval \ --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 } |