From 5a9e6f92fe1001afa1fec000be7fdb9bb1c681f0 Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Thu, 20 Feb 2014 10:04:07 -0500
Subject: reverse MINIMAL sense, remove free -h
---
Makefile | 10 +++++-----
setup.sh | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index e5167cd..32a59a8 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/setup.sh b/setup.sh
index 39b4e08..7efb951 100755
--- a/setup.sh
+++ b/setup.sh
@@ -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
--
cgit v1.2.3-70-g09d2