curl: split into multiple outputs

Also use pkgconfig to be safer and fix (some) referrers.
2015-10-13 20:18:48 +02:00
parent e71c9cfaa2
commit 99e4371526
25 changed files with 44 additions and 40 deletions
@@ -117,11 +117,11 @@ in {
      '';

      postStart = ''
-        until ${pkgs.curl}/bin/curl -s -L localhost:${toString cfg.port} ; do
+        until ${pkgs.curl.bin}/bin/curl -s -L localhost:${toString cfg.port} ; do
          sleep 10
        done
        while true ; do
-          index=`${pkgs.curl}/bin/curl -s -L localhost:${toString cfg.port}`
+          index=`${pkgs.curl.bin}/bin/curl -s -L localhost:${toString cfg.port}`
          if [[ !("$index" =~ 'Please wait while Jenkins is restarting' ||
                  "$index" =~ 'Please wait while Jenkins is getting ready to work') ]]; then
            exit 0