diff options
author | Alex Xu <alex_y_xu@yahoo.ca> | 2014-02-20 10:04:07 -0500 |
---|---|---|
committer | Alex Xu <alex_y_xu@yahoo.ca> | 2014-02-20 10:04:07 -0500 |
commit | 5a9e6f92fe1001afa1fec000be7fdb9bb1c681f0 (patch) | |
tree | c4a428e82536c2b2bfdeb2b6e51844ccc394372f | |
parent | 10856f2ded85f7747817f892d460d6b032fe62de (diff) | |
download | html5ks-5a9e6f92fe1001afa1fec000be7fdb9bb1c681f0.tar.xz html5ks-5a9e6f92fe1001afa1fec000be7fdb9bb1c681f0.zip |
reverse MINIMAL sense, remove free -h
-rw-r--r-- | Makefile | 10 | ||||
-rwxr-xr-x | setup.sh | 2 |
2 files changed, 6 insertions, 6 deletions
@@ -9,15 +9,15 @@ CONVERT ?= convert APNGASM ?= apngasm UGLIFYJS ?= uglifyjs ifdef MINIMAL -ZOPFLIPNG ?= zopflipng -DEFLOPT ?= wine DeflOpt -DEFLUFF ?= defluff -PNGQUANT ?= pngquant -else ZOPFLIPNG ?= : DEFLOPT ?= : DEFLUFF ?= : PNGQUANT ?= : +else +ZOPFLIPNG ?= zopflipng +DEFLOPT ?= wine DeflOpt +DEFLUFF ?= defluff +PNGQUANT ?= pngquant endif DUMP ?= www/dump @@ -3,7 +3,7 @@ if [ -z $MAKEOPTS ]; then MAKEOPTS="-j`nproc`" echo "No MAKEOPTS specified, setting $MAKEOPTS automatically." - printf "%siB free, approx 1GiB/core required (depending on ffmpeg settings)." "$(free -ht | tail -n 1 | awk '{print $4}')" + printf "%sGiB free RAM, approx 1GiB/core required (depending on ffmpeg settings)." "$(free -gt | tail -n 1 | awk '{print $4}')" fi set -e -x |