X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=JsCompile.php;h=c53bf6c6f8cd9119aa2a3df72f7a0a67c04c1920;hp=71d6ba72b2a820949f6bbda0417a2bda5b55dcb4;hb=HEAD;hpb=136195fedccd9bd17eb309716acefe39988432c4 diff --git a/JsCompile.php b/JsCompile.php index 71d6ba72..089db58d 100644 --- a/JsCompile.php +++ b/JsCompile.php @@ -230,17 +230,8 @@ class Pman_Core_JsCompile extends Pman // if packer is running, then dont compile - just output onebyone... - require_once 'System.php'; - $pg = System::which('pgrep'); - $cmd = "$pg roobuilder"; - $out = trim(`$cmd`); - if (strlen($out) > 0) { - return false; - } - - - + require_once 'System.php'; $packer = System::which('roojspacker'); @@ -261,6 +252,23 @@ class Pman_Core_JsCompile extends Pman return true; } + + + $pg = System::which('pgrep'); + if ($pg == '') { + echo ''; + return false; + } + + $cmd = "$pg roojspacker"; + $res = `$cmd`; + $out = empty($res) ? '' : trim($res); + if (strlen($out) > 0) { + echo ''; + return false; + } + + if (file_exists($output)) { unlink($output); }