Request 783 (accepted)

Overview

Request 783 (accepted)

Debian: put assets in the right place

Created by tpokorra almost 10 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit roundcubemail

Submit package home:tpokorr...:Development / roundcubemail to package Kolab:Development / roundcubemail

debian.changelog Changed

debian.rules Changed

@@ -24,20 +24,45 @@
 	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.css"`; do \
 		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
 		install -pm 755 -d $$asset_loc ; \
-		cp -av $$file $$asset_loc/$$(basename $$file) ; \
+		cat $$file > $$asset_loc/$$(basename $$file) && rm -rf $$file || \
+		mv -v $$file $$asset_loc/$$(basename $$file); \
 	done
 
-	# Compress the JS
-	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.js"`; do \
+	# Compress the JS, but not the already minified
+	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.js" ! -name "*.min.js"`; do \
 		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
 		install -pm 755 -d $$asset_loc ; \
-		cp -av $$file $$asset_loc/$$(basename $$file) ; \
+		cat $$file > $$asset_loc/$$(basename $$file) && rm -rf $$file || \
+		mv -v $$file $$asset_loc/$$(basename $$file); \
 	done
 
-	if [ -d "$(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/public_html/" ]; then \
-		mv $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/assets/ \
-			$(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/public_html/assets/ ; \
-	fi
+	# The already minified JS can just be copied over to the assets location
+	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.min.js"`; do \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		mv -v $$file $$asset_loc/$$(basename $$file); \
+	done
+
+	# Other assets
+	for file in $$(find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f \
+			-name "*.eot" -o \
+			-name "*.gif" -o \
+			-name "*.ico" -o \
+			-name "*.jpg" -o \
+			-name "*.png" -o \
+			-name "*.svg" -o \
+			-name "*.swf" -o \
+			-name "*.tif" -o \
+			-name "*.ttf" -o \
+			-name "*.woff" \
+		); do \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		mv -vf $$file $$asset_loc/$$(basename $$file); \
+	done
+
+	mv $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/assets/ \
+		$(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/public_html/assets/ 
 
 	mkdir -p $(CURDIR)/debian/roundcubemail/etc/roundcubemail/
 	cp -a config/config.inc.php.sample $(CURDIR)/debian/roundcubemail/etc/roundcubemail/config.inc.php

roundcubemail.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 783 0

Request History

tpokorra created request almost 10 years ago

Debian: put assets in the right place

timotheus accepted request almost 10 years ago

merge