From 046a29d7d5470c5b8cd19db198e98b3a7d86a472 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Wed, 13 Dec 2017 16:47:52 +0100
Subject: [PATCH] deliver CSS/JS as one file

---
 lam-packaging/buildPackages | 24 ++++++++++++------------
 lam-packaging/debian/minify | 26 +++++++++++++-------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/lam-packaging/buildPackages b/lam-packaging/buildPackages
index f46faf03..4b56005f 100755
--- a/lam-packaging/buildPackages
+++ b/lam-packaging/buildPackages
@@ -26,28 +26,28 @@ fi
 function minify {
 	local dir="$1"
 	echo "Minify JS files in $dir"
+	local outFile=$dir/100_lam.${VERSION}.min.js
 	local files=`ls $dir/*.js`
+	local jsFiles=""
 	for file in $files; do
-		closure-compiler --charset UTF-8 --js $file --js_output_file ${file}-MIN
-		rm $file
-		mv ${file}-MIN $file
-		# add final new line to supress Debian warnings
-		echo "" >> $file
+		jsFiles="$jsFiles --js $file"
 	done
+	closure-compiler --charset UTF-8 $jsFiles --js_output_file $outFile
+	rm $files
+	# add final new line to supress Debian warnings
+	echo "" >> $outFile
 }
 
 # minifies the CSS files
 function minifyCSS {
 	local dir="$1"
 	echo "Minify CSS files in $dir"
+	local outFile=$dir/100_lam.${VERSION}.min.css
 	local files=`ls $dir/*.css`
-	for file in $files; do
-		cleancss -o ${file}-MIN $file
-		rm $file
-		mv ${file}-MIN $file
-		# add final new line to supress Debian warnings
-		echo "" >> $file
-	done
+	cat $files | cleancss -o $outFile
+	rm $files
+	# add final new line to supress Debian warnings
+	echo "" >> $outFile
 }
 
 echo "Getting files..."
diff --git a/lam-packaging/debian/minify b/lam-packaging/debian/minify
index 7eae9cb4..5bfcb350 100755
--- a/lam-packaging/debian/minify
+++ b/lam-packaging/debian/minify
@@ -1,22 +1,22 @@
 #!/bin/bash
 
 set -e
-
+env
+outFile=templates/lib/100_lam.${SOURCE_DATE_EPOCH}.min.js
 files=`ls templates/lib/*.js`
+jsFiles=""
 for file in $files; do
-	closure-compiler --charset UTF-8 --js $file --js_output_file ${file}-MIN
-	rm $file
-	mv ${file}-MIN $file
-	# add final new line to supress Debian warnings
-	echo "" >> $file
+	jsFiles="$jsFiles --js $file"
 done
+closure-compiler --charset UTF-8 $jsFiles --js_output_file $outFile
+rm $files
+# add final new line to supress Debian warnings
+echo "" >> $outFile
 
 files=`ls style/*.css`
-for file in $files; do
-	cleancss -o ${file}-MIN $file
-	rm $file
-	mv ${file}-MIN $file
-	# add final new line to supress Debian warnings
-	echo "" >> $file
-done
+outFile=style/100_lam.${SOURCE_DATE_EPOCH}.min.css
+cat $files | cleancss -o ${outFile}
+rm $files
+# add final new line to supress Debian warnings
+echo "" >> $file