From b6a7cdb5e5c73293b6603f4a57d80017bc953bb2 Mon Sep 17 00:00:00 2001 From: BlackDex Date: Tue, 28 Mar 2023 17:49:13 +0200 Subject: [PATCH] Moved images into directory structure As requested in #122 moved all the image files into a correct directory structure. This does seem a bit logical indeed. And it makes it more clear where which replaced image goes. It also makes the `cp` command less error prone. Fixes #122 --- resources/{ => src}/favicon.ico | Bin resources/{ => src/images}/icon-dark.png | Bin resources/{ => src/images}/icon-white.png | Bin .../images/icons}/android-chrome-192x192.png | Bin .../images/icons}/android-chrome-512x512.png | Bin .../{ => src/images/icons}/apple-touch-icon.png | Bin resources/{ => src/images/icons}/favicon-16x16.png | Bin resources/{ => src/images/icons}/favicon-32x32.png | Bin .../{ => src/images/icons}/mstile-150x150.png | Bin .../{ => src/images/icons}/safari-pinned-tab.svg | 0 resources/{ => src/images}/logo-dark@2x.png | Bin resources/{ => src/images}/logo-white@2x.png | Bin scripts/apply_patches.sh | 13 +------------ 13 files changed, 1 insertion(+), 12 deletions(-) rename resources/{ => src}/favicon.ico (100%) rename resources/{ => src/images}/icon-dark.png (100%) rename resources/{ => src/images}/icon-white.png (100%) rename resources/{ => src/images/icons}/android-chrome-192x192.png (100%) rename resources/{ => src/images/icons}/android-chrome-512x512.png (100%) rename resources/{ => src/images/icons}/apple-touch-icon.png (100%) rename resources/{ => src/images/icons}/favicon-16x16.png (100%) rename resources/{ => src/images/icons}/favicon-32x32.png (100%) rename resources/{ => src/images/icons}/mstile-150x150.png (100%) rename resources/{ => src/images/icons}/safari-pinned-tab.svg (100%) rename resources/{ => src/images}/logo-dark@2x.png (100%) rename resources/{ => src/images}/logo-white@2x.png (100%) diff --git a/resources/favicon.ico b/resources/src/favicon.ico similarity index 100% rename from resources/favicon.ico rename to resources/src/favicon.ico diff --git a/resources/icon-dark.png b/resources/src/images/icon-dark.png similarity index 100% rename from resources/icon-dark.png rename to resources/src/images/icon-dark.png diff --git a/resources/icon-white.png b/resources/src/images/icon-white.png similarity index 100% rename from resources/icon-white.png rename to resources/src/images/icon-white.png diff --git a/resources/android-chrome-192x192.png b/resources/src/images/icons/android-chrome-192x192.png similarity index 100% rename from resources/android-chrome-192x192.png rename to resources/src/images/icons/android-chrome-192x192.png diff --git a/resources/android-chrome-512x512.png b/resources/src/images/icons/android-chrome-512x512.png similarity index 100% rename from resources/android-chrome-512x512.png rename to resources/src/images/icons/android-chrome-512x512.png diff --git a/resources/apple-touch-icon.png b/resources/src/images/icons/apple-touch-icon.png similarity index 100% rename from resources/apple-touch-icon.png rename to resources/src/images/icons/apple-touch-icon.png diff --git a/resources/favicon-16x16.png b/resources/src/images/icons/favicon-16x16.png similarity index 100% rename from resources/favicon-16x16.png rename to resources/src/images/icons/favicon-16x16.png diff --git a/resources/favicon-32x32.png b/resources/src/images/icons/favicon-32x32.png similarity index 100% rename from resources/favicon-32x32.png rename to resources/src/images/icons/favicon-32x32.png diff --git a/resources/mstile-150x150.png b/resources/src/images/icons/mstile-150x150.png similarity index 100% rename from resources/mstile-150x150.png rename to resources/src/images/icons/mstile-150x150.png diff --git a/resources/safari-pinned-tab.svg b/resources/src/images/icons/safari-pinned-tab.svg similarity index 100% rename from resources/safari-pinned-tab.svg rename to resources/src/images/icons/safari-pinned-tab.svg diff --git a/resources/logo-dark@2x.png b/resources/src/images/logo-dark@2x.png similarity index 100% rename from resources/logo-dark@2x.png rename to resources/src/images/logo-dark@2x.png diff --git a/resources/logo-white@2x.png b/resources/src/images/logo-white@2x.png similarity index 100% rename from resources/logo-white@2x.png rename to resources/src/images/logo-white@2x.png diff --git a/scripts/apply_patches.sh b/scripts/apply_patches.sh index a735972..6c80095 100755 --- a/scripts/apply_patches.sh +++ b/scripts/apply_patches.sh @@ -15,18 +15,7 @@ if [[ -z ${PATCH_NAME} ]]; then fi echo "Patching images" -cp -vf ../resources/logo-dark@2x.png ./apps/web/src/images/logo-dark@2x.png -cp -vf ../resources/logo-white@2x.png ./apps/web/src/images/logo-white@2x.png -cp -vf ../resources/icon-white.png ./apps/web/src/images/icon-white.png - -cp -vf ../resources/android-chrome-192x192.png ./apps/web/src/images/icons/android-chrome-192x192.png -cp -vf ../resources/android-chrome-512x512.png ./apps/web/src/images/icons/android-chrome-512x512.png -cp -vf ../resources/apple-touch-icon.png ./apps/web/src/images/icons/apple-touch-icon.png -cp -vf ../resources/favicon-16x16.png ./apps/web/src/images/icons/favicon-16x16.png -cp -vf ../resources/favicon-32x32.png ./apps/web/src/images/icons/favicon-32x32.png -cp -vf ../resources/mstile-150x150.png ./apps/web/src/images/icons/mstile-150x150.png -cp -vf ../resources/safari-pinned-tab.svg ./apps/web/src/images/icons/safari-pinned-tab.svg -cp -vf ../resources/favicon.ico ./apps/web/src/favicon.ico +cp -vfR ../resources/src/* ./apps/web/src/ echo "Using patch: ${PATCH_NAME}" git apply "../patches/${PATCH_NAME}" --reject