fix variables on update

[Pman.Core] / AssetTrait.php

diff --git a/AssetTrait.php b/AssetTrait.php
index d71d810..6e8627e 100644 (file)
--- a/AssetTrait.php
+++ b/AssetTrait.php
@@ -335,9 +335,16 @@ trait Pman_Core_AssetTrait {
             }
                  
             $fd = dirname($fp);
-                
-                
-            $cmd = "{$sassc} --style=compressed  --sourcemap=auto -I {$fd} -I {$this->rootDir}/roojs1/scss/bootstrap $smod.scss {$compiledir}/{$output}";
+            
+            $ver = `$sassc --version`;
+            $bits = explode("\n", $ver);
+            foreach($bits as $b) {
+                $lr = explode(":", $b);
+                $vers[trim($lr[0])] = trim($lr[1]);
+            } 
+            
+            $sm = $vers['sass'] > 3.4 ? ' --sourcemap=auto ' : '--sourcemap';
+            $cmd = "{$sassc} --style=compressed  {$sm} -I {$fd} -I {$this->rootDir}/roojs1/scss/bootstrap $smod.scss {$compiledir}/{$output}";
             //echo "$cmd\n";            echo `$cmd`;
             `$cmd`;
             
@@ -345,7 +352,7 @@ trait Pman_Core_AssetTrait {
             clearstatcache();
             if (!file_exists($compiledir.'/'.$output) ||
                 !filesize($compiledir.'/'.$routput)) {
-                echo "<!-- compile did not generate files : " . basename($compiledir) . "/{$output} -->\n";
+                echo "<!-- compile did not generate files : $cmd -->\n";
                 echo "<script type=\"text/javascript\">alert('Failed to compile {$fp}');</script>\n";
                 return;
             }