diff --git a/bootstrap.sh b/bootstrap.sh index 11791a8..47e946d 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -5,7 +5,7 @@ # To do this you need to vanilla composer package manager installed on your # system. You can install composer from Nixpkgs as follows: # -# nix-env -f '' -iA php phpPackages.composer +# nix-env -f '' -iA php phpPackages.composer nix-prefetch-scripts composer install php bin/composer2nix --composer-env src/Composer2Nix/composer-env.nix --no-copy-composer-env --executable diff --git a/src/Composer2Nix/Sources/GitSource.php b/src/Composer2Nix/Sources/GitSource.php index 0a32d76..8a9a76c 100644 --- a/src/Composer2Nix/Sources/GitSource.php +++ b/src/Composer2Nix/Sources/GitSource.php @@ -1,5 +1,6 @@ sourceObj['url'].'" '.$this->sourceObj["reference"]); - if($outputStr === false) + if($outputStr === false || $outputStr === null) throw new Exception("Error while invoking nix-prefetch-git"); else { diff --git a/src/Composer2Nix/Sources/HgSource.php b/src/Composer2Nix/Sources/HgSource.php index 9c2c210..e09b220 100644 --- a/src/Composer2Nix/Sources/HgSource.php +++ b/src/Composer2Nix/Sources/HgSource.php @@ -1,5 +1,6 @@