Run SASS relative to sass/
This is so that SASS/Compass can find images and other assets
This commit is contained in:
parent
52244956aa
commit
5587cc88ef
2 changed files with 31 additions and 33 deletions
|
@ -321,9 +321,10 @@
|
|||
(rss/make-filtered-channels public config posts-by-tag)
|
||||
(println (blue "compiling sass"))
|
||||
(sass/compile-sass->css!
|
||||
{:src-sass (str "resources/templates/" sass-src)
|
||||
:dest-sass (str "resources/public" blog-prefix "/" sass-dest)
|
||||
:ignored-files ignored-files})))
|
||||
{:src-sass sass-src
|
||||
:dest-sass (str "../public" blog-prefix "/" sass-dest)
|
||||
:ignored-files ignored-files
|
||||
:base-dir "resources/templates/"})))
|
||||
|
||||
(defn compile-assets-timed []
|
||||
(time
|
||||
|
|
|
@ -22,9 +22,9 @@
|
|||
(defn find-sass-files
|
||||
"Given a Diretory, gets files, Filtered to those having scss or sass
|
||||
extention. Ignores files matching any ignored regexps."
|
||||
[dir ignored-files]
|
||||
[base-dir dir ignored-files]
|
||||
(let [filename-filter (match-re-filter #"(?i:s[ca]ss$)")]
|
||||
(->> (.listFiles (io/file dir) filename-filter)
|
||||
(->> (.listFiles (io/file base-dir dir) filename-filter)
|
||||
(filter #(not (.isDirectory %)))
|
||||
(filter (ignore ignored-files))
|
||||
(map #(.getName %)))))
|
||||
|
@ -33,15 +33,14 @@
|
|||
"Given a sass file which might be in src-sass directory,
|
||||
output the resulting css in dest-sass. All error handling is
|
||||
done by sh / launching the sass command."
|
||||
[sass-file
|
||||
src-sass
|
||||
dest-sass
|
||||
compass?]
|
||||
(sh "sass"
|
||||
"--update"
|
||||
(when compass? "--compass")
|
||||
(str src-sass "/" sass-file)
|
||||
(str dest-sass "/" )))
|
||||
[{:keys [src-sass
|
||||
dest-sass
|
||||
base-dir]}]
|
||||
(shell/with-sh-dir base-dir
|
||||
(sh "sass"
|
||||
"--update"
|
||||
(when (compass-installed?) "--compass")
|
||||
(str src-sass ":" dest-sass))))
|
||||
|
||||
(defn compile-sass->css!
|
||||
"Given a directory src-sass, looks for all sass files and compiles them into
|
||||
|
@ -49,24 +48,22 @@ dest-sass. Prompts you to install sass if he finds sass files and can't find
|
|||
the command. Shows you any problems it comes across when compiling. "
|
||||
[{:keys [src-sass
|
||||
dest-sass
|
||||
ignored-files]}]
|
||||
(let [sass-files (find-sass-files src-sass ignored-files)]
|
||||
(if (seq sass-files)
|
||||
ignored-files
|
||||
base-dir] :as opts}]
|
||||
(when-let [sass-files (seq (find-sass-files base-dir src-sass ignored-files))]
|
||||
(if (sass-installed?)
|
||||
;; I found sass files,
|
||||
;; If sass is installed
|
||||
(if (sass-installed?)
|
||||
(let [compass? (compass-installed?)]
|
||||
;; I compile all files
|
||||
(doseq [a-file sass-files]
|
||||
(println "Compiling Sass File:" a-file src-sass dest-sass)
|
||||
(let [result (compile-sass-file! a-file src-sass dest-sass compass?)]
|
||||
(if (zero? (:exit result))
|
||||
;; no problems in sass compilation
|
||||
(println "Successfully compiled:" a-file)
|
||||
;; else I show the error
|
||||
(println (red (:err result))
|
||||
(red (:out result)))))))
|
||||
;; Else I prompt to install Sass
|
||||
(println "Sass seems not to be installed, but you have scss / sass files in "
|
||||
src-sass
|
||||
" - You might want to install it here: sass-lang.com")))))
|
||||
(do
|
||||
(println "Compiling Sass Files:" src-sass dest-sass)
|
||||
(let [result (compile-sass-file! opts)]
|
||||
(if (zero? (:exit result))
|
||||
;; no problems in sass compilation
|
||||
(println "Successfully compiled sass files")
|
||||
;; else I show the error
|
||||
(println (red (:err result))
|
||||
(red (:out result))))))
|
||||
;; Else I prompt to install Sass
|
||||
(println "Sass seems not to be installed, but you have scss / sass files in "
|
||||
src-sass
|
||||
" - You might want to install it here: sass-lang.com"))))
|
||||
|
|
Loading…
Reference in a new issue