Use convert -strip

to not embed timestamps in PNG output. See https://reproducible-builds.org/ for why this is good. Needed because of declined ImageMagick/ImageMagick#1270 This PR was done while working on reproducible builds for openSUSE.
bmwiedemann · Jan 26, 2020 · d594291 · d594291
1 parent a8775e1
commit d594291
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/build-darkmod.sh b/build-darkmod.sh
@@ -71,7 +71,7 @@ mkdir $ELM_ENLIGHT_THEME_PATH/img-color-convd
 inform "Converting images"
 pushd $ELM_ENLIGHT_THEME_PATH/img-color
 for F in `find -iname "*.png"`; do
-        convert $F -modulate $HIGH_BRIGHTNESS,$HIGH_SATURATION,$HIGH_HUE ../img-color-convd/$F
+        convert -strip $F -modulate $HIGH_BRIGHTNESS,$HIGH_SATURATION,$HIGH_HUE ../img-color-convd/$F
 done
 popd
 
@@ -116,22 +116,22 @@ fi
 if [ -d "$ELM_ENLIGHT_THEME_PATH/img-color-manual" ]; then
     pushd $ELM_ENLIGHT_THEME_PATH/img-color-manual
     for F in `find -iname "*.png"`; do
-            convert $F -modulate $HIGH_BRIGHTNESS,$HIGH_SATURATION,$HIGH_HUE ../img-color-convd/$F
+            convert -strip $F -modulate $HIGH_BRIGHTNESS,$HIGH_SATURATION,$HIGH_HUE ../img-color-convd/$F
     done
     popd
 fi
 
 # Converting background images
 pushd $ELM_ENLIGHT_THEME_PATH/img-bgnd
 for F in `find -iname "*.png"`; do
-    convert $F -channel rgb -brightness-contrast $BGND_BRIGHTNESS,$BGND_SATURATION +channel ../img-color-convd/$F
+    convert -strip $F -channel rgb -brightness-contrast $BGND_BRIGHTNESS,$BGND_SATURATION +channel ../img-color-convd/$F
 done
 popd
 
 #converting shadows
 pushd $ELM_ENLIGHT_THEME_PATH/img-shadow
 for F in `find -iname "*.png"`; do
-    convert $F -channel A -evaluate Multiply $SHADOW_MULT ../img-color-convd/$F
+    convert -strip $F -channel A -evaluate Multiply $SHADOW_MULT ../img-color-convd/$F
     # convert $F -channel A -evaluate set 20% ../img-color-convd/$F
     # cp $F ../img-color-convd/$F
 done
@@ -144,7 +144,7 @@ for icon in $(cat darkmod-fdo-icon-recolor.txt); do
     sed -i "s/#3399ff/$HIGH_HTML/g" $F
   done
   for F in `find $ELM_ENLIGHT_THEME_PATH/fdo -name "$icon.png"`; do
-    convert $F -modulate $HIGH_BRIGHTNESS,$HIGH_SATURATION,$HIGH_HUE $F
+    convert -strip $F -modulate $HIGH_BRIGHTNESS,$HIGH_SATURATION,$HIGH_HUE $F
   done
 done
 
@@ -311,29 +311,29 @@ if [ $DKMD_EPKG != 1 ]; then
 
     pushd $TERMINOLOGY_THEME_PATH/img-color
     for F in `find -iname "*.png"`; do
-            convert $F -modulate $HIGH_BRIGHTNESS,$HIGH_SATURATION,$HIGH_HUE ../img-color-convd/$F
+            convert -strip $F -modulate $HIGH_BRIGHTNESS,$HIGH_SATURATION,$HIGH_HUE ../img-color-convd/$F
     done
     popd
 
     if [ -d "$TERMINOLOGY_THEME_PATH/img-color-manual" ]; then
         pushd $TERMINOLOGY_THEME_PATH/img-color-manual
             for F in `find -iname "*.png"`; do
-                    convert $F -modulate $HIGH_BRIGHTNESS,$HIGH_SATURATION,$HIGH_HUE ../img-color-convd/$F
+                    convert -strip $F -modulate $HIGH_BRIGHTNESS,$HIGH_SATURATION,$HIGH_HUE ../img-color-convd/$F
             done
         popd
     fi
 
     # Converting background images
     pushd $TERMINOLOGY_THEME_PATH/img-bgnd
     for F in `find -iname "*.png"`; do
-        convert $F -brightness-contrast $BGND_BRIGHTNESS,$BGND_SATURATION ../img-color-convd/$F
+        convert -strip $F -brightness-contrast $BGND_BRIGHTNESS,$BGND_SATURATION ../img-color-convd/$F
     done
     popd
 
     #converting shadows
     pushd $TERMINOLOGY_THEME_PATH/img-shadow
     for F in `find -iname "*.png"`; do
-        convert $F -channel A -evaluate Multiply $SHADOW_MULT ../img-color-convd/$F
+        convert -strip $F -channel A -evaluate Multiply $SHADOW_MULT ../img-color-convd/$F
     done
     popd
 

diff --git a/darkmod-color-paths.conf b/darkmod-color-paths.conf
@@ -35,7 +35,7 @@ MANUAL_IMAGE_CONVD_DIR=img-manual-convd
 # Change the Highlight/blue color
 # http://www.imagemagick.org/script/command-line-options.php#modulate
 #
-# convert -modulate $HIGH_BRIGHTNESS $HIGH_SATURATION $HIGH_HUE
+# convert -strip -modulate $HIGH_BRIGHTNESS $HIGH_SATURATION $HIGH_HUE
 #
 # $HIGH_BRIGHTNESS 100 leave as is, 0 black 50 half bright 200 twice as bright
 # $HIGH_SATURATION 0 grey scale, 200 very colorful
@@ -50,7 +50,7 @@ HIGH_HUE=300
 # Change the background gradients
 # http://www.imagemagick.org/script/command-line-options.php#brightness-contrastX
 #
-# convert -brightness-contrast $BGND_BRIGHTNESS{x$BGND_CONTRAST}{%}}
+# convert -strip -brightness-contrast $BGND_BRIGHTNESS{x$BGND_CONTRAST}{%}}
 #
 # $BGND_BRIGHTNESS - relative brightness adjustment 0 does nothing range -100 to 100
 # $BGND_SATURATION - relative saturation adjustment 0 does nothing range -100 to 100