From 97ea80a9f881fd392101bb66a877b19f7aeea654 Mon Sep 17 00:00:00 2001 From: Vishwas Shashidhar Date: Wed, 19 Sep 2018 12:28:41 +0530 Subject: [PATCH] Update the version handler logic and remove the script --- installer/mac/preinstall.sh | 2 +- installer/mac/version_handler.sh | 10 ---------- package.json | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) delete mode 100755 installer/mac/version_handler.sh diff --git a/installer/mac/preinstall.sh b/installer/mac/preinstall.sh index 131873c9..a747d32c 100755 --- a/installer/mac/preinstall.sh +++ b/installer/mac/preinstall.sh @@ -12,7 +12,7 @@ delete_app() compare_versions() { # Get the installer version: - CURRENT_VERSION=3.1.0 + CURRENT_VERSION=3.3.0 # Get the currently installed version: INSTALLED_VERSION=$(plutil -p /Applications/Symphony.app/Contents/Info.plist | awk '/CFBundleShortVersionString/ {print substr($3, 2, length($3)-2)}') diff --git a/installer/mac/version_handler.sh b/installer/mac/version_handler.sh deleted file mode 100755 index d1ecec37..00000000 --- a/installer/mac/version_handler.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Read the actual version from package.json -VERSION=$(sed -n 's/\"version\"[[:space:]]*\:[[:space:]]*\"\([^}]*\)\",/\1/p' package.json) - -# Trim trailing and leading spaces -VERSION=$(echo ${VERSION} | xargs) - -# Replace the current version variable in the pre-install script -sed -i '' -e "s/CURRENT_VERSION=.*/CURRENT_VERSION=${VERSION}/g" ./installer/mac/preinstall.sh \ No newline at end of file diff --git a/package.json b/package.json index c4456e69..cf72ce3e 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "demo-win": "npm run prebuild && cross-env ELECTRON_DEV=true electron . --url=file:///demo/index.html", "demo-mac": "npm run prebuild && cross-env ELECTRON_DEV=true electron . --url=file://$(pwd)/demo/index.html", "unpacked-mac": "npm run prebuild && npm run test && build --mac --dir", - "packed-mac": "sh installer/mac/version_handler.sh && npm run unpacked-mac && packagesbuild -v installer/mac/symphony-mac-packager.pkgproj", + "packed-mac": "npm run unpacked-mac && packagesbuild -v installer/mac/symphony-mac-packager.pkgproj", "unpacked-win": "npm run prebuild && npm run test && build --win --x64 --dir", "unpacked-win-x86": "npm run prebuild && npm run test && build --win --ia32 --dir" },