From 307b60dd25b1074c15c9387a7791ef4f1e79f236 Mon Sep 17 00:00:00 2001 From: Vishwas Shashidhar Date: Tue, 30 May 2017 22:39:34 +0530 Subject: [PATCH] =?UTF-8?q?electron-37:=20fixed=20issues=20w.r.t.=20instal?= =?UTF-8?q?ler=20pane=20not=20capturing=20the=20pod=E2=80=A6=20(#115)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * electron-37: fixed issues w.r.t. installer pane not capturing the pod url and also added startup plist in the post install script * electron-37: removed watch paths on launch agent --- .gitignore | 3 ++- .../Contents/MacOS/SymphonySettingsPlugin | Bin 21168 -> 25712 bytes .../Resources/Base.lproj/MyInstallerPane.nib | Bin 5544 -> 5478 bytes .../Contents/_CodeSignature/CodeResources | 4 ++-- .../UserInterfaceState.xcuserstate | Bin 18982 -> 0 bytes .../Base.lproj/MyInstallerPane.xib | 4 +--- .../SymphonySettingsPlugin/MyInstallerPane.h | 1 + .../SymphonySettingsPlugin/MyInstallerPane.m | 5 ++-- installer/mac/postinstall.sh | 22 ++++++++++++++++++ installer/mac/symphony-mac-packager.pkgproj | 16 ++++++------- 10 files changed, 38 insertions(+), 17 deletions(-) delete mode 100644 installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin.xcodeproj/project.xcworkspace/xcuserdata/vishwas.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/.gitignore b/.gitignore index 24134bb3f..12286f896 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ DerivedData/ !default.mode2v3 *.perspectivev3 !default.perspectivev3 -xcuserdata/ *.moved-aside *.xccheckout *.xcscmblueprint @@ -23,3 +22,5 @@ xcuserdata/ *.dSYM.zip *.dSYM installer/mac/build/ +installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin.xcodeproj/xcuserdata +installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin.xcodeproj/project.xcworkspace/xcuserdata \ No newline at end of file diff --git a/installer/mac/SymphonySettingsPlugin.bundle/Contents/MacOS/SymphonySettingsPlugin b/installer/mac/SymphonySettingsPlugin.bundle/Contents/MacOS/SymphonySettingsPlugin index 24055ded6f0e7431eed227034b789f2186f1ab08..c207b0b066acddcf6d1aaafb2068d39c1f3f5161 100755 GIT binary patch delta 4236 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 u+_*~H4mYE9d4~#>ckJf1~IE2(nB>w>;lpS;c diff --git a/installer/mac/SymphonySettingsPlugin.bundle/Contents/Resources/Base.lproj/MyInstallerPane.nib b/installer/mac/SymphonySettingsPlugin.bundle/Contents/Resources/Base.lproj/MyInstallerPane.nib index 2f92f7c3d806f9d84184413e8900ddbf482dfc3d..142cfd8746efe5f0f2ada94849f406abdd0cfe5f 100644 GIT binary patch delta 1457 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 pPQhttfb(z>uEI6A0e8H}OT8_;;od>sF~;+U@k Resources/Base.lproj/MyInstallerPane.nib - 3HG8UEw6WFkbwFZjfhIU/OzjLks= + 4ukZOKTe6287gYe3sqxm+1qqsb8= Resources/InstallerSections.plist @@ -37,7 +37,7 @@ hash2 - WevXKKGDjV20uPQvqf0GCvSehTCXdBwwHhIijv6ffPg= + JYmp/b032I4vsgp6hW2iH2wQ1Zu0ADIXbVGTnb9xzOE= Resources/InstallerSections.plist diff --git a/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin.xcodeproj/project.xcworkspace/xcuserdata/vishwas.xcuserdatad/UserInterfaceState.xcuserstate b/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin.xcodeproj/project.xcworkspace/xcuserdata/vishwas.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 9597fec942ac406e6d63ec8d409adcefc3766052..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18982 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 + @@ -76,9 +77,6 @@ - - - diff --git a/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/MyInstallerPane.h b/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/MyInstallerPane.h index c7fbaf7b5..a942401e4 100644 --- a/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/MyInstallerPane.h +++ b/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/MyInstallerPane.h @@ -11,5 +11,6 @@ @property (weak) IBOutlet NSButton *minimizeOnCloseCheckBox; @property (weak) IBOutlet NSButton *autoLaunchCheckBox; +@property (weak) IBOutlet NSTextField *podUrlTextBox; @end diff --git a/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/MyInstallerPane.m b/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/MyInstallerPane.m index f2a1bc422..ae6a99f4c 100644 --- a/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/MyInstallerPane.m +++ b/installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/MyInstallerPane.m @@ -14,13 +14,12 @@ - (NSString *)title return [[NSBundle bundleForClass:[self class]] localizedStringForKey:@"PaneTitle" value:nil table:nil]; } -- (IBAction)capturePodUrl:(NSTextField *)sender { +- (void)willExitPane:(InstallerSectionDirection)dir { // Set the default protocol to https NSString *protocol = @"https://"; - // Capture the pod url entered by the user - NSString *podUrl = sender.stringValue; + NSString *podUrl = [_podUrlTextBox stringValue]; // If the pod url is empty, by default, set it to my.symphony.com if ([podUrl length] == 0) { diff --git a/installer/mac/postinstall.sh b/installer/mac/postinstall.sh index f9feb617a..e2fb34ff3 100755 --- a/installer/mac/postinstall.sh +++ b/installer/mac/postinstall.sh @@ -16,5 +16,27 @@ sed -i "" -E "s#\"url\" ?: ?\".*\"#\"url\"\: \"$pod_url\"#g" $newPath sed -i "" -E "s#\"minimizeOnClose\" ?: ?([Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee])#\"minimizeOnClose\":\ $minimize_on_close#g" $newPath sed -i "" -E "s#\"launchOnStartup\" ?: ?([Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee])#\"launchOnStartup\":\ $launch_on_startup#g" $newPath +## Add app to login items +if [ $launch_on_startup == true ]; then +cat > ~/Library/LaunchAgents/com.symphony.symphony-desktop.agent.plist << EOT + + + + + Label + com.symphony.symphony-desktop.agent + ProgramArguments + + $installPath/Symphony.app/Contents/MacOS/Symphony + + RunAtLoad + + + +EOT +else +launchctl unload ~/Library/LaunchAgents/com.symphony.symphony-desktop.agent.plist +fi + ## Remove the temp settings file created ## rm -f $tempFilePath diff --git a/installer/mac/symphony-mac-packager.pkgproj b/installer/mac/symphony-mac-packager.pkgproj index 735601449..885663c40 100644 --- a/installer/mac/symphony-mac-packager.pkgproj +++ b/installer/mac/symphony-mac-packager.pkgproj @@ -568,14 +568,6 @@ LIST_TITLE_KEY InstallerSectionTitle - - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS - ICPresentationViewDestinationSelectController - INSTALLER_PLUGIN - TargetSelect - LIST_TITLE_KEY - InstallerSectionTitle - ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS ICPresentationViewInstallerPluginController @@ -587,6 +579,14 @@ 1 + + ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS + ICPresentationViewDestinationSelectController + INSTALLER_PLUGIN + TargetSelect + LIST_TITLE_KEY + InstallerSectionTitle + ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS ICPresentationViewInstallationTypeController