From 6f0fe93aade762bfbec6637364b2ad1ae749ef8d Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Thu, 1 Dec 2016 12:11:08 -0400 Subject: [PATCH] chore: improve naming of build scripts (#918) - `darwin/configure-electron.sh` -> `darwin/electron-configure-package-darwin.sh` - `darwin/installer-zip.sh` -> `darwin/electron-installer-app-zip.sh` - `darwin/installer-dmg.sh` -> `darwin/electron-installer-dmg.sh` - `darwin/sign.sh` -> `darwin/electron-sign-app.sh` - `linux/configure-electron.sh` -> `linux/electron-configure-package-linux.sh` - `linux/installer-appimage.sh` -> `linux/electron-installer-appimage.sh` - `linux/installer-deb.sh` -> `linux/electron-installer-debian.sh` - `unix/create-asar.sh` -> `unix/electron-create-asar.sh` - `unix/create-electron-app.sh` -> `unix/electron-create-resources-app.sh` - `unix/download-electron.sh` -> `unix/electron-download-package.sh` Signed-off-by: Juan Cruz Viotti --- scripts/build/darwin.sh | 22 +++++++++---------- scripts/build/linux.sh | 20 ++++++++--------- ...h => electron-configure-package-darwin.sh} | 0 ...r-zip.sh => electron-installer-app-zip.sh} | 0 ...aller-dmg.sh => electron-installer-dmg.sh} | 2 +- .../darwin/{sign.sh => electron-sign-app.sh} | 0 ...sh => electron-configure-package-linux.sh} | 0 ...mage.sh => electron-installer-appimage.sh} | 0 ...er-deb.sh => electron-installer-debian.sh} | 0 ...create-asar.sh => electron-create-asar.sh} | 0 ...pp.sh => electron-create-resources-app.sh} | 0 ...ectron.sh => electron-download-package.sh} | 0 12 files changed, 22 insertions(+), 22 deletions(-) rename scripts/darwin/{configure-electron.sh => electron-configure-package-darwin.sh} (100%) rename scripts/darwin/{installer-zip.sh => electron-installer-app-zip.sh} (100%) rename scripts/darwin/{installer-dmg.sh => electron-installer-dmg.sh} (98%) rename scripts/darwin/{sign.sh => electron-sign-app.sh} (100%) rename scripts/linux/{configure-electron.sh => electron-configure-package-linux.sh} (100%) rename scripts/linux/{installer-appimage.sh => electron-installer-appimage.sh} (100%) rename scripts/linux/{installer-deb.sh => electron-installer-debian.sh} (100%) rename scripts/unix/{create-asar.sh => electron-create-asar.sh} (100%) rename scripts/unix/{create-electron-app.sh => electron-create-resources-app.sh} (100%) rename scripts/unix/{download-electron.sh => electron-download-package.sh} (100%) diff --git a/scripts/build/darwin.sh b/scripts/build/darwin.sh index 0c77a3a3..2c0cea5f 100755 --- a/scripts/build/darwin.sh +++ b/scripts/build/darwin.sh @@ -67,7 +67,7 @@ if [ "$COMMAND" == "develop-electron" ]; then fi if [ "$COMMAND" == "installer-dmg" ]; then - ./scripts/unix/create-electron-app.sh \ + ./scripts/unix/electron-create-resources-app.sh \ -s . \ -f "lib,build,assets" \ -o "etcher-release/app" @@ -81,17 +81,17 @@ if [ "$COMMAND" == "installer-dmg" ]; then ./scripts/unix/dependencies-bower.sh -p \ -x "etcher-release/app" - ./scripts/unix/create-asar.sh \ + ./scripts/unix/electron-create-asar.sh \ -d "etcher-release/app" \ -o "etcher-release/app.asar" - ./scripts/unix/download-electron.sh \ + ./scripts/unix/electron-download-package.sh \ -r x64 \ -v "$ELECTRON_VERSION" \ -s darwin \ -o etcher-release/$APPLICATION_NAME-darwin-x64 - ./scripts/darwin/configure-electron.sh \ + ./scripts/darwin/electron-configure-package-darwin.sh \ -d etcher-release/$APPLICATION_NAME-darwin-x64 \ -n $APPLICATION_NAME \ -v $APPLICATION_VERSION \ @@ -101,7 +101,7 @@ if [ "$COMMAND" == "installer-dmg" ]; then -a "etcher-release/app.asar" \ -i assets/icon.icns - ./scripts/darwin/installer-dmg.sh \ + ./scripts/darwin/electron-installer-dmg.sh \ -n $APPLICATION_NAME \ -v $APPLICATION_VERSION \ -p etcher-release/$APPLICATION_NAME-darwin-x64 \ @@ -114,7 +114,7 @@ if [ "$COMMAND" == "installer-dmg" ]; then fi if [ "$COMMAND" == "installer-zip" ]; then - ./scripts/unix/create-electron-app.sh \ + ./scripts/unix/electron-create-resources-app.sh \ -s . \ -f "lib,build,assets" \ -o "etcher-release/app" @@ -128,17 +128,17 @@ if [ "$COMMAND" == "installer-zip" ]; then ./scripts/unix/dependencies-bower.sh -p \ -x "etcher-release/app" - ./scripts/unix/create-asar.sh \ + ./scripts/unix/electron-create-asar.sh \ -d "etcher-release/app" \ -o "etcher-release/app.asar" - ./scripts/unix/download-electron.sh \ + ./scripts/unix/electron-download-package.sh \ -r x64 \ -v "$ELECTRON_VERSION" \ -s darwin \ -o etcher-release/$APPLICATION_NAME-darwin-x64 - ./scripts/darwin/configure-electron.sh \ + ./scripts/darwin/electron-configure-package-darwin.sh \ -d etcher-release/$APPLICATION_NAME-darwin-x64 \ -n $APPLICATION_NAME \ -v $APPLICATION_VERSION \ @@ -148,11 +148,11 @@ if [ "$COMMAND" == "installer-zip" ]; then -a "etcher-release/app.asar" \ -i assets/icon.icns - ./scripts/darwin/sign.sh \ + ./scripts/darwin/electron-sign-app.sh \ -a etcher-release/$APPLICATION_NAME-darwin-x64/$APPLICATION_NAME.app \ -i "$SIGN_IDENTITY_OSX" - ./scripts/darwin/installer-zip.sh \ + ./scripts/darwin/electron-installer-app-zip.sh \ -a etcher-release/$APPLICATION_NAME-darwin-x64/$APPLICATION_NAME.app \ -o etcher-release/installers/$APPLICATION_NAME-$APPLICATION_VERSION-darwin-x64.zip diff --git a/scripts/build/linux.sh b/scripts/build/linux.sh index 7379f42a..1c7f4d16 100755 --- a/scripts/build/linux.sh +++ b/scripts/build/linux.sh @@ -87,7 +87,7 @@ if [ "$COMMAND" == "installer-cli" ]; then fi if [ "$COMMAND" == "installer-debian" ]; then - ./scripts/unix/create-electron-app.sh \ + ./scripts/unix/electron-create-resources-app.sh \ -s . \ -f "lib,build,assets" \ -o "etcher-release/app" @@ -101,24 +101,24 @@ if [ "$COMMAND" == "installer-debian" ]; then ./scripts/unix/dependencies-bower.sh -p \ -x "etcher-release/app" - ./scripts/unix/create-asar.sh \ + ./scripts/unix/electron-create-asar.sh \ -d "etcher-release/app" \ -o "etcher-release/app.asar" - ./scripts/unix/download-electron.sh \ + ./scripts/unix/electron-download-package.sh \ -r "$ARCH" \ -v "$ELECTRON_VERSION" \ -s linux \ -o "etcher-release/$APPLICATION_NAME-linux-$ARCH" - ./scripts/linux/configure-electron.sh \ + ./scripts/linux/electron-configure-package-linux.sh \ -d etcher-release/$APPLICATION_NAME-linux-$ARCH \ -n "$APPLICATION_NAME" \ -v "$APPLICATION_VERSION" \ -l LICENSE \ -a "etcher-release/app.asar" - ./scripts/linux/installer-deb.sh \ + ./scripts/linux/electron-installer-debian.sh \ -p etcher-release/$APPLICATION_NAME-linux-$ARCH \ -r "$ARCH" \ -c scripts/build/debian/config.json \ @@ -130,7 +130,7 @@ fi if [ "$COMMAND" == "installer-appimage" ]; then check_dep zip - ./scripts/unix/create-electron-app.sh \ + ./scripts/unix/electron-create-resources-app.sh \ -s . \ -f "lib,build,assets" \ -o "etcher-release/app" @@ -144,24 +144,24 @@ if [ "$COMMAND" == "installer-appimage" ]; then ./scripts/unix/dependencies-bower.sh -p \ -x "etcher-release/app" - ./scripts/unix/create-asar.sh \ + ./scripts/unix/electron-create-asar.sh \ -d "etcher-release/app" \ -o "etcher-release/app.asar" - ./scripts/unix/download-electron.sh \ + ./scripts/unix/electron-download-package.sh \ -r "$ARCH" \ -v "$ELECTRON_VERSION" \ -s linux \ -o "etcher-release/$APPLICATION_NAME-linux-$ARCH" - ./scripts/linux/configure-electron.sh \ + ./scripts/linux/electron-configure-package-linux.sh \ -d etcher-release/$APPLICATION_NAME-linux-$ARCH \ -n "$APPLICATION_NAME" \ -v "$APPLICATION_VERSION" \ -l LICENSE \ -a "etcher-release/app.asar" - ./scripts/linux/installer-appimage.sh \ + ./scripts/linux/electron-installer-appimage.sh \ -n "$APPLICATION_NAME" \ -d "$APPLICATION_DESCRIPTION" \ -p etcher-release/$APPLICATION_NAME-linux-$ARCH \ diff --git a/scripts/darwin/configure-electron.sh b/scripts/darwin/electron-configure-package-darwin.sh similarity index 100% rename from scripts/darwin/configure-electron.sh rename to scripts/darwin/electron-configure-package-darwin.sh diff --git a/scripts/darwin/installer-zip.sh b/scripts/darwin/electron-installer-app-zip.sh similarity index 100% rename from scripts/darwin/installer-zip.sh rename to scripts/darwin/electron-installer-app-zip.sh diff --git a/scripts/darwin/installer-dmg.sh b/scripts/darwin/electron-installer-dmg.sh similarity index 98% rename from scripts/darwin/installer-dmg.sh rename to scripts/darwin/electron-installer-dmg.sh index 621503f3..61b72181 100755 --- a/scripts/darwin/installer-dmg.sh +++ b/scripts/darwin/electron-installer-dmg.sh @@ -160,7 +160,7 @@ sync afsctool -ci -9 "$VOLUME_APPLICATION" # TODO: this should be decoupled from this script -./scripts/darwin/sign.sh -a "$VOLUME_APPLICATION" -i "$ARGV_IDENTITY" +./scripts/darwin/electron-sign-app.sh -a "$VOLUME_APPLICATION" -i "$ARGV_IDENTITY" # Unmount temporary DMG image. hdiutil detach "$VOLUME_DIRECTORY" diff --git a/scripts/darwin/sign.sh b/scripts/darwin/electron-sign-app.sh similarity index 100% rename from scripts/darwin/sign.sh rename to scripts/darwin/electron-sign-app.sh diff --git a/scripts/linux/configure-electron.sh b/scripts/linux/electron-configure-package-linux.sh similarity index 100% rename from scripts/linux/configure-electron.sh rename to scripts/linux/electron-configure-package-linux.sh diff --git a/scripts/linux/installer-appimage.sh b/scripts/linux/electron-installer-appimage.sh similarity index 100% rename from scripts/linux/installer-appimage.sh rename to scripts/linux/electron-installer-appimage.sh diff --git a/scripts/linux/installer-deb.sh b/scripts/linux/electron-installer-debian.sh similarity index 100% rename from scripts/linux/installer-deb.sh rename to scripts/linux/electron-installer-debian.sh diff --git a/scripts/unix/create-asar.sh b/scripts/unix/electron-create-asar.sh similarity index 100% rename from scripts/unix/create-asar.sh rename to scripts/unix/electron-create-asar.sh diff --git a/scripts/unix/create-electron-app.sh b/scripts/unix/electron-create-resources-app.sh similarity index 100% rename from scripts/unix/create-electron-app.sh rename to scripts/unix/electron-create-resources-app.sh diff --git a/scripts/unix/download-electron.sh b/scripts/unix/electron-download-package.sh similarity index 100% rename from scripts/unix/download-electron.sh rename to scripts/unix/electron-download-package.sh