From fec61e43631bd374d2b261b3ca5ec5a9891adb5a Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 30 Dec 2020 17:53:01 +0800 Subject: [PATCH] handle sassc version --- AssetTrait.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/AssetTrait.php b/AssetTrait.php index 11770eeb..6e8627ea 100644 --- 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`; -- 2.39.2