Various shell scripts improvements, switch to oxipng

scripts/xmb-convert.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # MonoChrome SVG to PNG Converter
 #
@@ -17,6 +17,20 @@
 #     ./convert.sh monochrome battery-full
 #     ./convert.sh flatui DOS
 
+exitFlag=0
+checkCommand() {
+	if ! command -v "${1}" >/dev/null; then
+		echo "${1} not installed!"
+		exitFlag=1
+	fi
+}
+checkCommand 'inkscape'
+checkCommand 'oxipng'
+if [[ ${exitFlag} -eq 1 ]]; then
+	exit 1
+fi
+
 cd -- "$(cd -- "$(dirname -- "$0")" && pwd -P)"
 
 inkscape -z -e "$1/png/$2.png" -w 256 -h 256 "../src/xmb/$1/$2.svg"
+oxipng --quiet --zopfli --opt max --strip all "$1/png/$2.png"

src/sounds/convert_ogg.sh

@@ -1,14 +1,28 @@
+#!/usr/bin/env bash
+
+exitFlag=0
+checkCommand() {
+	if ! command -v "${1}" >/dev/null; then
+		echo "${1} not installed!"
+		exitFlag=1
+	fi
+}
+checkCommand 'ffmpeg'
+if [[ ${exitFlag} -eq 1 ]]; then
+	exit 1
+fi
+
 # Script to convert to OGG, rename to lowercase and copy chosen sounds
 # requires ffmpeg and libvorbis/libogg
 SOUNDS="OK.wav CANCEL.wav BGM.wav UP.wav DOWN.wav LAUNCH.wav NOTICE.wav NOTICE_BACK.wav"
 
 mkdir -p ../../sounds
 for src in $SOUNDS; do
-        export dest=`echo $src | sed "s/.wav/.ogg/"`
-        export dest=`echo "$dest" | tr '[:upper:]' '[:lower:]'`
-        echo "$src -> $dest"
-        
-        ffmpeg -i $src -acodec libvorbis ../../sounds/$dest
+	export dest=$(echo $src | sed "s/.wav/.ogg/")
+	export dest=$(echo "$dest" | tr '[:upper:]' '[:lower:]')
+	echo "$src -> $dest"
+
+	ffmpeg -i $src -acodec libvorbis ../../sounds/$dest
 done
-        
+
 cp Licence.txt ../../sounds/Licence.txt

src/xmb/convert_xmb_assets.sh

@@ -1,3 +1,18 @@
+#!/usr/bin/env bash
+
+exitFlag=0
+checkCommand() {
+	if ! command -v "${1}" >/dev/null; then
+		echo "${1} not installed!"
+		exitFlag=1
+	fi
+}
+checkCommand 'convert'
+checkCommand 'oxipng'
+if [[ ${exitFlag} -eq 1 ]]; then
+	exit 1
+fi
+
 convert_xmb_assets()
 {
 	SRC_DIR="$1"
@@ -50,7 +65,7 @@ convert_xmb_assets()
 					else
 						convert -background 'rgb(255,255,255)' -alpha Background "$SRC_FILE" -resize $SCALE_FACTOR "$DST_FILE"
 					fi
-					optipng -quiet -o7 -strip all "$DST_FILE"
+					oxipng --quiet --zopfli --opt max --strip all "$DST_FILE"
 
 				fi
 			done

src/xmb/monochrome/export.sh

@@ -1,13 +1,28 @@
+#!/usr/bin/env bash
+
+exitFlag=0
+checkCommand() {
+	if ! command -v "${1}" >/dev/null; then
+		echo "${1} not installed!"
+		exitFlag=1
+	fi
+}
+checkCommand 'inkscape'
+checkCommand 'magick'
+checkCommand 'oxipng'
+if [[ ${exitFlag} -eq 1 ]]; then
+	exit 1
+fi
+
 for src in *.svg; do
 	echo $src;
-	export dest=`echo $src | sed "s/.svg/.png/"`
+	export dest=$(echo $src | sed "s/.svg/.png/")
 	mkdir -p ../../../xmb/monochrome/png
 	inkscape -z -C -w 256 -h 256 -f "$src" -e "../../../xmb/monochrome/png/$dest"
 	magick mogrify -background 'rgb(255,255,255)' -alpha Background "../../../xmb/monochrome/png/$dest"
-	optipng -o7 -strip all "../../../xmb/monochrome/png/$dest"
+	oxipng --quiet --zopfli --opt max --strip all "../../../xmb/monochrome/png/$dest"
 	#rsvg-convert -b none -w 256 -h 256 "$src" -o "../png/$dest"
 	#convert -density 360 -background none "$src" "../png/$dest"
 	#convert "../png/$dest" -write mpr:temp -background black -alpha Remove mpr:temp -compose Copy_Opacity -composite "../png/$dest"
 	#python2 ../../NPMApng2PMApng.py "../png/$dest" "../png/$dest"
 done
-

src/xmb/monochrome/export_ozone.sh

@@ -1,3 +1,19 @@
+#!/usr/bin/env bash
+
+exitFlag=0
+checkCommand() {
+	if ! command -v "${1}" >/dev/null; then
+		echo "${1} not installed!"
+		exitFlag=1
+	fi
+}
+checkCommand 'inkscape'
+checkCommand 'magick'
+checkCommand 'oxipng'
+if [[ ${exitFlag} -eq 1 ]]; then
+	exit 1
+fi
+
 for src in *.svg
 do
    fletter="$(echo $src | head -c 1)"
@@ -21,49 +37,49 @@ do
 
 	echo "Exporting $src ($size x $size)"
 
-   export dest=`echo $src | sed "s/.svg/.png/"`
+   export dest=$(echo $src | sed "s/.svg/.png/")
    mkdir -p ../../../ozone/png/icons
    inkscape -z -C -w $size -h $size -f "$src" -e "../../../ozone/png/icons/$dest"
    magick mogrify -background 'rgb(255,255,255)' -alpha Background "../../../ozone/png/icons/$dest"
-   optipng -o7 -strip all "../../../ozone/png/icons/$dest"
+   oxipng --quiet --zopfli --opt max --strip all "../../../ozone/png/icons/$dest"
 done
 
 # Override some icons (different size and color)
 src="clock.svg"
-export dest=`echo $src | sed "s/.svg/.png/"`
+export dest=$(echo $src | sed "s/.svg/.png/")
 mkdir -p ../../../ozone/png/icons
 inkscape -z -C -w 92 -h 92 -f "$src" -e "../../../ozone/png/icons/$dest"
 magick mogrify -background 'rgb(255,255,255)' -alpha Background "../../../ozone/png/icons/$dest"
-optipng -o7 -strip all "../../../ozone/png/icons/$dest"
+oxipng --quiet --zopfli --opt max --strip all "../../../ozone/png/icons/$dest"
 
 for src in battery-*.svg; do
-   export dest=`echo $src | sed "s/.svg/.png/"`
+   export dest=$(echo $src | sed "s/.svg/.png/")
    mkdir -p ../../../ozone/png/icons
    inkscape -z -C -w 92 -h 92 -f "$src" -e "../../../ozone/png/icons/$dest"
    magick mogrify -background 'rgb(255,255,255)' -alpha Background "../../../ozone/png/icons/$dest"
-   optipng -o7 -strip all "../../../ozone/png/icons/$dest"
+   oxipng --quiet --zopfli --opt max --strip all "../../../ozone/png/icons/$dest"
 done
 
 src="dialog-slice.svg"
-export dest=`echo $src | sed "s/.svg/.png/"`
+export dest=$(echo $src | sed "s/.svg/.png/")
 mkdir -p ../../../ozone/png/icons
 inkscape -z -C -w 256 -h 256 -f "$src" -e "../../../ozone/png/icons/$dest"
 magick mogrify -background 'rgb(255,255,255)' -alpha Background "../../../ozone/png/icons/$dest"
-optipng -o7 -strip all "../../../ozone/png/icons/$dest"
+oxipng --quiet --zopfli --opt max --strip all "../../../ozone/png/icons/$dest"
 
 src="key-hover.svg"
-export dest=`echo $src | sed "s/.svg/.png/"`
+export dest=$(echo $src | sed "s/.svg/.png/")
 mkdir -p ../../../ozone/png/icons
 inkscape -z -C -w 256 -h 256 -f "$src" -e "../../../ozone/png/icons/$dest"
 magick mogrify -background 'rgb(255,255,255)' -alpha Background "../../../ozone/png/icons/$dest"
-optipng -o7 -strip all "../../../ozone/png/icons/$dest"
+oxipng --quiet --zopfli --opt max --strip all "../../../ozone/png/icons/$dest"
 
 src="key.svg"
-export dest=`echo $src | sed "s/.svg/.png/"`
+export dest=$(echo $src | sed "s/.svg/.png/")
 mkdir -p ../../../ozone/png/icons
 inkscape -z -C -w 256 -h 256 -f "$src" -e "../../../ozone/png/icons/$dest"
 magick mogrify -background 'rgb(255,255,255)' -alpha Background "../../../ozone/png/icons/$dest"
-optipng -o7 -strip all "../../../ozone/png/icons/$dest"
+oxipng --quiet --zopfli --opt max --strip all "../../../ozone/png/icons/$dest"
 
 # Export auxiliary sidebar icons
 SIDEBAR_SRC[0]="add.svg"            # add.png
@@ -146,7 +162,7 @@ do
    fi
 
    magick mogrify -background 'rgb(255,255,255)' -alpha Background "../../../ozone/png/sidebar/$dest"
-   optipng -o7 -strip all "../../../ozone/png/sidebar/$dest"
+   oxipng --quiet --zopfli --opt max --strip all "../../../ozone/png/sidebar/$dest"
 
 done
 
@@ -158,7 +174,7 @@ dest="netplay.png"
 magick convert "$src" xc:"#ffffff" -channel RGB -clut "../../../ozone/png/sidebar/$dest"
 magick mogrify -resize 64x64 "../../../ozone/png/sidebar/$dest"
 magick mogrify -background 'rgb(255,255,255)' -alpha Background "../../../ozone/png/sidebar/$dest"
-optipng -o7 -strip all "../../../ozone/png/sidebar/$dest"
+oxipng --quiet --zopfli --opt max --strip all "../../../ozone/png/sidebar/$dest"
 
 # Export main RetroArch icon
 src="menu_quickmenu.svg"
@@ -170,4 +186,4 @@ border_size=11
 inkscape -z -C -w $size -h $size -f "$src" -e "../../../ozone/png/$dest"
 magick mogrify -shave $border_size "../../../ozone/png/$dest"
 magick mogrify -background 'rgb(255,255,255)' -alpha Background "../../../ozone/png/$dest"
-optipng -o7 -strip all "../../../ozone/png/$dest"
+oxipng --quiet --zopfli --opt max --strip all "../../../ozone/png/$dest"