IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-23 15:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Only build the UI with uglifyjs on RHEL 8

Browse Source 
The previous expression tested for RHEL or RHEL-like
systems to use uglifyjs. Tighten that up to only RHEL 8
so future RHEL can use rjsmin.

https://pagure.io/freeipa/issue/8669

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
This commit is contained in:
Rob Crittenden 2021-01-28 13:20:49 -05:00
parent 75c1b7ed34
commit 43f344b931
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install/ui/util/compile.sh
View File

@ -111,7 +111,9 @@ fi
# compile using python rjsmin on most platforms and uglify-js on RHEL 8 # compile using python rjsmin on most platforms and uglify-js on RHEL 8
echo "Minimizing: $RDIR/$RELEASE/$LAYER.js" echo "Minimizing: $RDIR/$RELEASE/$LAYER.js"
echo "Target file: $OUTPUT_FILE" echo "Target file: $OUTPUT_FILE"
if [[ "$ID" == "rhel" ]] || [[ "$ID_LIKE" =~ "rhel" ]]; then if [[ ("$ID" == "rhel" || "$ID_LIKE" =~ "rhel")
&& "$VERSION_ID" =~ "8." ]];
then
echo "Minifier: uglifyjs" echo "Minifier: uglifyjs"
uglifyjs < $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE uglifyjs < $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE
else else