From 1b1f26636ed2cb65c4e8baba41c1534cda3c83c1 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 17 Mar 2015 15:00:16 -0700 Subject: [PATCH] iojs: Fix update-iojs script The nix-instantiate invocations only work correctly if this script is run from the root directory of nixpkgs, or in a directory without a default.nix file and NIX_PATH set appropriately. --- pkgs/development/web/iojs/update-iojs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/iojs/update-iojs b/pkgs/development/web/iojs/update-iojs index e0e073a0ff9..3140c5e842b 100755 --- a/pkgs/development/web/iojs/update-iojs +++ b/pkgs/development/web/iojs/update-iojs @@ -1,10 +1,12 @@ -#!/bin/sh -e +#!/bin/sh # # Fetch the latest io.js release (stable/nightly) and update # `default.nix` in this directory. # -cd "$(dirname "$0")" +set -e + +HERE="$(dirname "$0")" latest() { curl -s "$1" | grep 'href="v' \ @@ -39,11 +41,11 @@ nightly=$(latest_log nightly 'https://iojs.org/download/nightly/') sed -i \ "/version = if nightly/s/then.*/then \"$nightly\" else \"$stable\";/" \ - default.nix + "$HERE/default.nix" stableHash=$(hash_log "$(url iojs.src)") nightlyHash=$(hash_log "$(url iojs-nightly.src)") sed -i \ "/sha256 = if nightly/{N;s/\"[^\"]*\"/\"$nightlyHash\"/;N;s/\"[^\"]*\";/\"$stableHash\";/}" \ - default.nix + "$HERE/default.nix"