From b3fb0b07e83cdc15564556828dfc89729d9ee7bb Mon Sep 17 00:00:00 2001 From: shockrahwow Date: Wed, 13 Nov 2019 19:03:19 -0800 Subject: [PATCH] make now just calls sass builder --- server/Makefile | 3 +++ server/scripts/build-sass.sh | 18 ++++++++++++++++++ server/scripts/build.sh | 29 ----------------------------- 3 files changed, 21 insertions(+), 29 deletions(-) create mode 100755 server/scripts/build-sass.sh delete mode 100755 server/scripts/build.sh diff --git a/server/Makefile b/server/Makefile index f1b816f..85be2a4 100644 --- a/server/Makefile +++ b/server/Makefile @@ -2,6 +2,9 @@ BUILD=cargo build build: $(BUILD) +css: + sh scripts/build-sass.sh + test: cargo test diff --git a/server/scripts/build-sass.sh b/server/scripts/build-sass.sh new file mode 100755 index 0000000..b955038 --- /dev/null +++ b/server/scripts/build-sass.sh @@ -0,0 +1,18 @@ +#!/bin/sh +# This script is intended to be called by make ngl + +# Building all the ass because this is a massive fucking pain in make + +build_dir="static/css" +sass_dir="static/sass" + +build() { + echo Building $1 css in $build_dir/$1.css + sass "$sass_dir/$1.scss" "$build_dir/$1.css" +} + +# Build each thing because sass blows +for sf in $sass_dir/*;do + b=`basename $sf` + sass "$sf" "$build_dir/${b%.*}.css" +done diff --git a/server/scripts/build.sh b/server/scripts/build.sh deleted file mode 100755 index e35511c..0000000 --- a/server/scripts/build.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -build_dir="static/css" -sass_dir="static/sass" - -if [ ! -d $build_dir ]; then - mkdir -p $build_dir -fi - -login="login" - -build() { - echo Building $1 css in $build_dir/$1.css - sass "$sass_dir/$1.scss" "$build_dir/$1.css" -} - -_flags() { - echo '-b FILE : build css from sass' -} - -if [ -z "$1" ];then - _flags -fi - -while getopts ":b:" opt; do - case $opt in - b) build $2;; - esac -done