From 52af3e8aa8b2fb0171ff141f2cf64fd64082694e Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Tue, 2 Jan 2018 08:11:43 -0400 Subject: [PATCH] chore: re-organize files inside assets/ (#1941) This is the file convention that Resin Concourse will use. I flattened the directory for simplicity. Change-Type: patch Signed-off-by: Juan Cruz Viotti --- Makefile | 6 +++--- assets/{iconset => }/128x128.png | Bin assets/{iconset => }/16x16.png | Bin assets/{iconset => }/256x256.png | Bin assets/{iconset => }/32x32.png | Bin assets/{iconset => }/48x48.png | Bin assets/{iconset => }/512x512.png | Bin assets/{osx/installer.png => dmg-installer.png} | Bin assets/{osx/installer.tiff => dmg-installer.tiff} | Bin .../{osx/installer@2x.png => dmg-installer@2x.png} | Bin electron-builder.yml | 4 ++-- 11 files changed, 5 insertions(+), 5 deletions(-) rename assets/{iconset => }/128x128.png (100%) rename assets/{iconset => }/16x16.png (100%) rename assets/{iconset => }/256x256.png (100%) rename assets/{iconset => }/32x32.png (100%) rename assets/{iconset => }/48x48.png (100%) rename assets/{iconset => }/512x512.png (100%) rename assets/{osx/installer.png => dmg-installer.png} (100%) rename assets/{osx/installer.tiff => dmg-installer.tiff} (100%) rename assets/{osx/installer@2x.png => dmg-installer@2x.png} (100%) diff --git a/Makefile b/Makefile index 35467bba..21f52c7c 100644 --- a/Makefile +++ b/Makefile @@ -284,16 +284,16 @@ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$( # GUI # --------------------------------------------------------------------- -assets/osx/installer.tiff: assets/osx/installer.png assets/osx/installer@2x.png +assets/dmg-installer.tiff: assets/dmg-installer.png assets/dmg-installer@2x.png tiffutil -cathidpicheck $^ -out $@ -$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION).dmg: assets/osx/installer.tiff \ +$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION).dmg: assets/dmg-installer.tiff \ | $(BUILD_DIRECTORY) TARGET_ARCH=$(TARGET_ARCH) build --mac dmg $(ELECTRON_BUILDER_OPTIONS) \ --extraMetadata.version=$(APPLICATION_VERSION) \ --extraMetadata.packageType=dmg -$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-mac.zip: assets/osx/installer.tiff \ +$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-mac.zip: assets/dmg-installer.tiff \ | $(BUILD_DIRECTORY) TARGET_ARCH=$(TARGET_ARCH) build --mac zip $(ELECTRON_BUILDER_OPTIONS) \ --extraMetadata.version=$(APPLICATION_VERSION) \ diff --git a/assets/iconset/128x128.png b/assets/128x128.png similarity index 100% rename from assets/iconset/128x128.png rename to assets/128x128.png diff --git a/assets/iconset/16x16.png b/assets/16x16.png similarity index 100% rename from assets/iconset/16x16.png rename to assets/16x16.png diff --git a/assets/iconset/256x256.png b/assets/256x256.png similarity index 100% rename from assets/iconset/256x256.png rename to assets/256x256.png diff --git a/assets/iconset/32x32.png b/assets/32x32.png similarity index 100% rename from assets/iconset/32x32.png rename to assets/32x32.png diff --git a/assets/iconset/48x48.png b/assets/48x48.png similarity index 100% rename from assets/iconset/48x48.png rename to assets/48x48.png diff --git a/assets/iconset/512x512.png b/assets/512x512.png similarity index 100% rename from assets/iconset/512x512.png rename to assets/512x512.png diff --git a/assets/osx/installer.png b/assets/dmg-installer.png similarity index 100% rename from assets/osx/installer.png rename to assets/dmg-installer.png diff --git a/assets/osx/installer.tiff b/assets/dmg-installer.tiff similarity index 100% rename from assets/osx/installer.tiff rename to assets/dmg-installer.tiff diff --git a/assets/osx/installer@2x.png b/assets/dmg-installer@2x.png similarity index 100% rename from assets/osx/installer@2x.png rename to assets/dmg-installer@2x.png diff --git a/electron-builder.yml b/electron-builder.yml index fa625cac..4a3e4a07 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -13,7 +13,7 @@ mac: icon: assets/icon.icns category: public.app-category.developer-tools dmg: - background: assets/osx/installer.tiff + background: assets/dmg-installer.tiff icon: assets/icon.icns iconSize: 110 contents: @@ -44,7 +44,7 @@ linux: packageCategory: utils executableName: etcher-electron synopsis: Etcher is a powerful OS image flasher built with web technologies to ensure flashing an SDCard or USB drive is a pleasant and safe experience. It protects you from accidentally writing to your hard-drives, ensures every byte of data was written correctly and much more. - icon: assets/iconset/ + icon: assets deb: priority: optional depends: