From a90d377faa456dce146d13f5175e1f3429afc8b8 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Mon, 10 Dec 2018 17:53:38 +0100 Subject: [PATCH] replaced closure-compiler --- lam-packaging/buildPackages | 4 ++-- lam-packaging/debian/control | 2 +- lam-packaging/debian/minify | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lam-packaging/buildPackages b/lam-packaging/buildPackages index 638a2d88..22286051 100755 --- a/lam-packaging/buildPackages +++ b/lam-packaging/buildPackages @@ -30,9 +30,9 @@ function minify { local files=`ls $dir/*.js` local jsFiles="" for file in $files; do - jsFiles="$jsFiles --js $file" + jsFiles="$jsFiles $file" done - closure-compiler --charset UTF-8 $jsFiles --js_output_file $outFile + uglifyjs -o $outFile $jsFiles rm $files # add final new line to supress Debian warnings echo "" >> $outFile diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control index 39751eba..41e31d5f 100644 --- a/lam-packaging/debian/control +++ b/lam-packaging/debian/control @@ -3,7 +3,7 @@ Maintainer: Roland Gruber Section: web Priority: optional Standards-Version: 4.2.1 -Build-Depends: debhelper (>= 9), po-debconf, cleancss, closure-compiler +Build-Depends: debhelper (>= 9), po-debconf, cleancss, node-uglify Homepage: https://www.ldap-account-manager.org/ Package: ldap-account-manager diff --git a/lam-packaging/debian/minify b/lam-packaging/debian/minify index e95646fe..7fea7296 100755 --- a/lam-packaging/debian/minify +++ b/lam-packaging/debian/minify @@ -6,9 +6,9 @@ if [ ! -e $outFile ]; then files=`ls templates/lib/*.js` jsFiles="" for file in $files; do - jsFiles="$jsFiles --js $file" + jsFiles="$jsFiles $file" done - closure-compiler --charset UTF-8 $jsFiles --js_output_file $outFile + uglifyjs -o $outFile $jsFiles rm $files # add final new line to supress Debian warnings echo "" >> $outFile