From 6100ba73807cef9a97898e7413ef8a81445018fc Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Sat, 4 Jul 2020 14:43:04 +0200 Subject: [PATCH] - fix update script (CRITICAL UPDATE); - v2.1.6 --- Stats.xcodeproj/project.pbxproj | 4 ++-- Stats/AppDelegate.swift | 4 ++++ StatsKit/updater.sh | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Stats.xcodeproj/project.pbxproj b/Stats.xcodeproj/project.pbxproj index a0299004..cd06f0f6 100644 --- a/Stats.xcodeproj/project.pbxproj +++ b/Stats.xcodeproj/project.pbxproj @@ -1700,7 +1700,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 2.1.5; + MARKETING_VERSION = 2.1.6; PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1732,7 +1732,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 2.1.5; + MARKETING_VERSION = 2.1.6; PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Stats/AppDelegate.swift b/Stats/AppDelegate.swift index 63f87782..7765f37b 100755 --- a/Stats/AppDelegate.swift +++ b/Stats/AppDelegate.swift @@ -188,6 +188,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele self.updateActivity.repeats = true self.updateActivity.interval = 60 * 60 * 12 // once in 12 hour + if store.bool(key: "checkUpdatesOnLogin", defaultValue: true) { + self.checkForNewVersion(false) + } + self.updateActivity.schedule { (completion: @escaping NSBackgroundActivityScheduler.CompletionHandler) in if !store.bool(key: "checkUpdatesOnLogin", defaultValue: true) { completion(NSBackgroundActivityScheduler.Result.finished) diff --git a/StatsKit/updater.sh b/StatsKit/updater.sh index 0701c9b5..43a917d9 100644 --- a/StatsKit/updater.sh +++ b/StatsKit/updater.sh @@ -30,8 +30,8 @@ if [[ "$STEP" == "1" ]]; then /usr/bin/mktemp -d $MOUNT_PATH /usr/bin/hdiutil attach "$DMG_PATH" -mountpoint "$MOUNT_PATH" -noverify -nobrowse -noautoopen - cp $MOUNT_PATH/Stats.app/Contents/Resources/Scripts/updater.sh $MOUNT_PATH/updater.sh - sh $MOUNT_PATH/updater.sh --step 2 --app "$CURRENT_PATH" --dmg "$DMG_PATH" & + cp $MOUNT_PATH/Stats.app/Contents/Resources/Scripts/updater.sh $TMPDIR/updater.sh + sh $TMPDIR/updater.sh --step 2 --app "$CURRENT_PATH" --dmg "$DMG_PATH" & kill -9 $PID