Copy Linux icons from the artwork dir.

oldnaari · Mar 1, 2020 · f84efcc · f84efcc
1 parent 282bc82
commit f84efcc
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 3 deletions.
diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
@@ -26,6 +26,7 @@ fi
 
 PACKAGING_DIR=$(python -c "import os; print(os.path.dirname(os.path.realpath('$0')))")
 TEMPLATE_ROOT="${PACKAGING_DIR}/../../"
+ARTWORK_DIR="${PACKAGING_DIR}/../artwork/"
 
 # shellcheck source=mod.config
 . "${TEMPLATE_ROOT}/mod.config"
@@ -144,9 +145,9 @@ if [ -f "${PACKAGING_DIR}/mod_scalable.svg" ]; then
 fi
 
 for i in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024; do
-  if [ -f "${PACKAGING_DIR}/mod_${i}.png" ]; then
-    install -Dm644 "${PACKAGING_DIR}/mod_${i}.png" "${BUILTDIR}/usr/share/icons/hicolor/${i}/apps/openra-${MOD_ID}.png"
-    install -m644 "${PACKAGING_DIR}/mod_${i}.png" "${BUILTDIR}/openra-${MOD_ID}.png"
+  if [ -f "${ARTWORK_DIR}/icon_${i}.png" ]; then
+    install -Dm644 "${ARTWORK_DIR}/icon_${i}.png" "${BUILTDIR}/usr/share/icons/hicolor/${i}/apps/openra-${MOD_ID}.png"
+    install -m644 "${ARTWORK_DIR}/icon_${i}.png" "${BUILTDIR}/openra-${MOD_ID}.png"
   fi
 done
 

diff --git a/packaging/linux/mod_128x128.png b/packaging/linux/mod_128x128.png
diff --git a/packaging/linux/mod_16x16.png b/packaging/linux/mod_16x16.png
diff --git a/packaging/linux/mod_256x256.png b/packaging/linux/mod_256x256.png
diff --git a/packaging/linux/mod_32x32.png b/packaging/linux/mod_32x32.png
diff --git a/packaging/linux/mod_48x48.png b/packaging/linux/mod_48x48.png
diff --git a/packaging/linux/mod_64x64.png b/packaging/linux/mod_64x64.png