Merge pull request #61 from Shufflepuck/feature/migration-to-amaris

Migration to Amaris

.jazzy.yaml

@@ -1,9 +1,9 @@
-module: CasperSplash
+module: SplashBuddy
 author: François Levaux-Tiffreau
 author_url: https://maclovin.org
-github_url: https://github.com/ftiff/CasperSplash
+github_url: https://github.com/ShufflePuck/SplashBuddy
 copyright: 'GPLv3'
-xcodebuild_arguments: [-target, CasperSplash]
+xcodebuild_arguments: [-target, SplashBuddy]
 clean: true
 min_acl: private
 skip_undocumented: true

.swiftlint.yml

@@ -0,0 +1,7 @@
+included:
+- SplashBuddy
+
+line_length: 200
+
+opt_in_rules:
+- empty_count

.travis.import_identity.sh

@@ -15,7 +15,7 @@ security unlock-keychain -p travis $KEY_CHAIN
 security set-keychain-settings -t 3600 -u $KEY_CHAIN
 
 # Add certificates to keychain and allow codesign to access them
-security import Assets/Mac-Developer-20180109.p12 -k $KEY_CHAIN -P $KEY_PASSWORD -T /usr/bin/codesign
+security import Assets/Mac-Developer-20180129.p12 -k $KEY_CHAIN -P $KEY_PASSWORD -T /usr/bin/codesign
 
 security set-key-partition-list -S apple-tool:,apple: -s -k travis $KEY_CHAIN
 

.travis.yml

@@ -18,9 +18,11 @@ notifications:
 slack: macadmins:Q5jgs97J5c9fqvubb1Kk301W
 before_install:
 - openssl aes-256-cbc -K $encrypted_280089750dac_key -iv $encrypted_280089750dac_iv
-  -in Assets/Mac-Developer-20180109.p12.enc -out Assets/Mac-Developer-20180109.p12
+  -in Assets/Mac-Developer-20180129.p12.enc -out Assets/Mac-Developer-20180129.p12
   -d
 - "./.travis.import_identity.sh"
 env:
   global:
     secure: FzKTuSMe7KHjDt/oYuSj4qyo6E+jPrVHbtpDjA/jCRTJHoapdY6LfEKSu6MvCUKZ7u5b3YqqJveIfbnPJnZDoMxLLfNd+SJfHCLlgnpmvgN4tFOrIbfbkHcqn2Ae3BGEzMTGg8fvDZQLMn5MlMM/5+oUWSHX9xGBsDW5g2USZnt7L8GmjuBoJ88fFono2btSTbQUDc159Ji0LBDlXmEvGXDiTWmAsCHXVQPGTVDDQ+EeFVBbm+n/FCKdrsRGRn03RXXFuphx6QHjFlgfSCBSQxPTjHXYUqrAAQXZw5igU6K4Xtc+c+dk/iWpbbx40g9LJCWxLRSSdGnu+uFthsgMqmdKqmqOL9k+EpuhA76cGrXLr4VNfhP+8aNd2roGhO/yFauoYS711TEA8M7zQ3oSYzgcdGWV0MF8g8AfQ4TMyZxSP2wDJ0ZpEyRtOeNAGEeE9yCMR8UNLVa6GE9MM70ToAg0p7e6Tcyp2uXepgZdHD1G/oI0Rg6oeltrgOb+/wD3nLN0ZKBd5fxXlX0mNH7Pr7rybhqu2jTDUGMZ2CehcL9OlRENHL81rZD5R2n5HZ20METs4ockpJt4dfKsj+ivGNw2TEiBuvVKdx2m2V5Yd+uA9pHFCI1Sc9VL6TN8OXOEBuoqMHNxNqYSepgudEA3iPsoGXeohaXU+ImnN/czR20=
+dd:
+  secure: qzE6u6esDKQhnqTDObVPWm8yVEWut/SaymexwkAfF0oi4PmE7dJq67iTwitJO2qpIwQelQafTFs+NlFVhUIwDO8NO5JEO7f5YubezSFWyCVOzPfiQD+f2f+V7gxZQTNazyc73vtDQ6V/n8FCFAifXYAtII2YxKdcL+nK+sW+UJRNwqo7+J/l4QknadZD22WouskE4nu5972j9ZgFlaYgIRScpkSYt6BEmIH77ohP66YrpC+5uIegNxOORQCx59y5oODW4u4zkP3HOjR6m03DKRroIjDYD63z9/F4/APu9AM5c5vYdiiEt9I5A1jC8LCLsFdZOWjtJFducKnB7bNN4dC6UmxeTu2LY7klEM7R/12kP9W+sCcf0zxY3UYPYSz5R+ANajXLLriMpKoR1mDAfQE4RjuAyI4UClm6Bt0FH+S2OWXkjJ5Ruv3Hv3MaEGedGRmFRU27ADfiM0PZ+UzW73ML68nqawLxSo9CimFPPbUeuvzHpVcBoveNLJiYJeWFuaYgtycoLFYzNlhZpRBeGw1dVT1vm7TwR6xmaeJ5hNP6ul34SWKizzAQKstCaeVt9dyH0Z3DPXHuBDVysXt4GmG2GZSqCyxaiiR5+joY3i5sisDtIZ1fMEWzJPnWybWHeM46F1Ic2qwNIBn0vM5gdawfalNYg5ftfznk9DbfoKE=

CHANGELOG.md

@@ -1,15 +1,15 @@
 # Change Log
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-
 ## [1.2]
 
 ### Added
 
-* `/var/tmp/SplashBuddy/` with more tag files : `CriticalDone` (All critical softwares are installed), `ErrorWhileInstalling` (Errors while installing), `AllInstalled` (All software is installed (failed or success)), `AllSuccessfullyInstalled` (All software is sucessfully installed).
+* `/var/tmp/SplashBuddy/` with more tag files : `criticalDone` (All critical softwares are installed), `errorWhileInstalling` (Errors while installing), `allInstalled` (All software is installed (failed or success)), `allSuccessfullyInstalled` (All software is sucessfully installed).
 * With `labMode` set to `true`, SplashBuddy will automatically display `complete.html` from `presentation.bundle` when all software is done installing (successfully or not) -- thank you @howardgmac
 
 ### Changed
@@ -30,12 +30,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 * Italian localization
 
 ### Changed
+
 * Brand new Layout!
 * Added Temporary exception to sandbox to allow sending Apple Events to Login Window (to restart etc.)
 * Continue button can now be hidden
 * Moved Userinput on a separate branch. Feature is not ready for 1.1
 
 ### Fixed
+
 * `.SplashBuddyDone` will be set when all critical items are done (`canContinue` = `false`) (@LovelessInSeattle)
 * A failed item will no longer activate continue button (@LovelessInSeattle)
 
@@ -86,19 +88,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 * Disable relaunch on login. This should be controlled by a LaunchAgent. (thanks @grahamrpugh)
 * Background window now stays in front of Dock (thanks @jwojda)
 
-# Contributors
+## Contributors
 
 ## Code
 
-- François 'ftiff' Levaux-Tiffreau (@ftiff)
-- @cybertunnel
-- Joel Rennich (@mactroll)
-
+* François 'ftiff' Levaux-Tiffreau (@ftiff)
+* @cybertunnel
+* Joel Rennich (@mactroll)
 
 ## Localization
 
-- French (fr): François Levaux-Tiffreau (@ftiff)
-- Dutch (nl): @riddl0rd, @thomasb
-- German (de): Mic Milic Frederickx (@kermic)
-
-
+* French (fr): François Levaux-Tiffreau (@ftiff)
+* Dutch (nl): @riddl0rd, @thomasb
+* German (de): Mic Milic Frederickx (@kermic)

CONTRIBUTING.md

@@ -1,7 +1,7 @@
-👏🏼💕😎 Thanks for taking the time to contribute!! 😎💕👏🏼
-
 # Contributing Guide
 
+👏🏼💕😎 Thanks for taking the time to contribute!! 😎💕👏🏼
+
 ## What should I know before starting?
 
 SplashBuddy goal is to provide an *elegant* and *secure* onboarding process for Mac users using [DEP](https://www.apple.com/business/dep/).
@@ -25,20 +25,20 @@ By *secure* we mean:
 
 ### Contributing to localizations
 
-Please [create an issue](https://github.com/ftiff/SplashBuddy/issues/new) if a localization is incorrect, incomplete or missing.
+Please [create an issue](https://github.com/Shufflepuck/SplashBuddy/issues/new) if a localization is incorrect, incomplete or missing.
 
 ### Contributing to documentation
 
-The [wiki](https://github.com/ftiff/SplashBuddy/wiki) is open to edit for everyone. Don't hesitate to modify it!
+The [wiki](https://github.com/Shufflepuck/SplashBuddy/wiki) is open to edit for everyone. Don't hesitate to modify it!
 
-Please ask for help in the Slack channel (see below) or [create an issue](https://github.com/ftiff/SplashBuddy/issues/new) if you're uncertain.
+Please ask for help in the Slack channel (see below) or [create an issue](https://github.com/Shufflepuck/SplashBuddy/issues/new) if you're uncertain.
 
 ### Contributing to code
 
 Please create a pick a topic in the issues section:
 
-* [Beginner issues](https://github.com/ftiff/SplashBuddy/labels/beginner) - issues which should only require a few lines of code, and a test or two.
-* [Help wanted issues](https://github.com/ftiff/SplashBuddy/labels/help%20wanted) - issues which should be a bit more involved than `beginner` issues.
+* [Beginner issues](https://github.com/Shufflepuck/SplashBuddy/labels/beginner) - issues which should only require a few lines of code, and a test or two.
+* [Help wanted issues](https://github.com/Shufflepuck/SplashBuddy/labels/help%20wanted) - issues which should be a bit more involved than `beginner` issues.
 
 Please start from `master` branch and create a PR when you're ready to submit the code.
 

README.md

@@ -1,52 +1,47 @@
-[![Build Status](https://travis-ci.org/ftiff/SplashBuddy.svg?branch=master)](https://travis-ci.org/ftiff/SplashBuddy)
-![](https://img.shields.io/badge/Swift-4.0-brightgreen.svg)
-![](https://img.shields.io/badge/macOS-10.12.6-brightgreen.svg)
-![](https://img.shields.io/badge/macOS-10.13-brightgreen.svg)
-
+# SplashBuddy
 
-![](https://img.shields.io/badge/Version-1.0-lightgrey.svg)
-![](https://img.shields.io/badge/License-Apache%202.0-lightgrey.svg)
-[![Support](https://supporterhq.com/api/b/ahkcfnbm4sib0djpa9xhee78p/SplashBuddy)](https://supporterhq.com/support/ahkcfnbm4sib0djpa9xhee78p/SplashBuddy)
+[![Build Status](https://travis-ci.org/Shufflepuck/SplashBuddy.svg?branch=master)](https://travis-ci.org/Shufflepuck/SplashBuddy)
+![Swift](https://img.shields.io/badge/Swift-4.0-brightgreen.svg)
+![macOS](https://img.shields.io/badge/macOS-10.12.6-brightgreen.svg)
+![macOS](https://img.shields.io/badge/macOS-10.13-brightgreen.svg)
 
-# SplashBuddy
+![Version](https://img.shields.io/badge/Version-1.2.0-lightgrey.svg)
+![License](https://img.shields.io/badge/License-Apache%202.0-lightgrey.svg)
 
-SplashBuddy goal is to provide an *elegant* and *secure* onboarding process for Mac users using [DEP](https://www.apple.com/business/dep/). 
+SplashBuddy goal is to provide an *elegant* and *secure* onboarding process for Mac users using [DEP](https://www.apple.com/business/dep/).
 
 It allows you to:
 
 - Prevent your users from using their Mac before the minimum software is installed
 - Provide status on the software that is currently being installed
 - Display important information
 
-It currently supports Jamf Pro. You're welcome to [contribute](https://github.com/ftiff/SplashBuddy/blob/master/CONTRIBUTING.md) to the project. Every little helps.
+It currently supports Jamf Pro. You're welcome to [contribute](https://github.com/Shufflepuck/SplashBuddy/blob/master/CONTRIBUTING.md) to the project. Every little helps.
 
 ## In action
 
-Here's a video of the SplashBuddy running at Culture Amp that was presented during [Macbrained](http://smithjw.me/2017/03/24/Onboarding-talk-at-Macbrained/) (Click on the image).
+![SplashBuddy](Assets/secrid_splashbuddy.jpeg)
 
-[![](Assets/CultureAmp-MBP.png)](https://cultureamp.wistia.com/medias/8gpvhpwgn4)
+Here's a video of the SplashBuddy (v1.0) running at Culture Amp that was presented during [Macbrained](http://smithjw.me/2017/03/24/Onboarding-talk-at-Macbrained/): [Link](https://cultureamp.wistia.com/medias/8gpvhpwgn4).
 
 ## Quick Start
 
-The best place to start is the [Kickstart Guide](https://github.com/ftiff/SplashBuddy/wiki/30---kickstart-guide).
-
+The best place to start is the [Kickstart Guide](https://github.com/Shufflepuck/SplashBuddy/wiki/30---kickstart-guide).
 
 ## Release history
 
 The release history is available [here](CHANGELOG.md).
 
 Splashbuddy was made possible thanks to the work of [the following individuals](THANKS.md).
 
-
-## Getting help 
+## Getting help
 
 The best place to discuss SplashBuddy is to join the `#splashbuddy` channel on the [MacAdmins Slack](https://macadmins.herokuapp.com).
 
 [Subscribe to the newsletter](http://eepurl.com/cZZ50T) to get news, tips and tricks.
 
-
 ## Contributing
 
-I (ftiff) have been working countless hours at night for two years to bring SplashBuddy to life. [Many others](https://github.com/ftiff/SplashBuddy/blob/master/THANKS.md) invested time in it too. 
+I (ftiff) have been working countless hours at night for two years to bring SplashBuddy to life. [Many others](https://github.com/Shufflepuck/SplashBuddy/blob/master/THANKS.md) invested time in it too.
 
-You can also [contribute](https://github.com/ftiff/SplashBuddy/blob/master/CONTRIBUTING.md) and be part of this list.
+You can also [contribute](https://github.com/Shufflepuck/SplashBuddy/blob/master/CONTRIBUTING.md) and be part of this list.

SplashBuddy.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 48;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -373,6 +373,7 @@
 				089D29191D50D12200E58C6D /* Sources */,
 				089D291A1D50D12200E58C6D /* Frameworks */,
 				089D291B1D50D12200E58C6D /* Resources */,
+				ED9E81AF2012341B000D8632 /* SwiftLint */,
 			);
 			buildRules = (
 			);
@@ -410,13 +411,12 @@
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
 				LastUpgradeCheck = 0900;
-				ORGANIZATIONNAME = "François Levaux-Tiffreau";
+				ORGANIZATIONNAME = "Amaris Technologies GmbH";
 				TargetAttributes = {
 					089D291C1D50D12200E58C6D = {
 						CreatedOnToolsVersion = 7.3.1;
-						DevelopmentTeam = EM3ER8T33A;
 						LastSwiftMigration = 0900;
-						ProvisioningStyle = Automatic;
+						ProvisioningStyle = Manual;
 						SystemCapabilities = {
 							com.apple.Sandbox = {
 								enabled = 1;
@@ -431,7 +431,7 @@
 				};
 			};
 			buildConfigurationList = 089D29181D50D12200E58C6D /* Build configuration list for PBXProject "SplashBuddy" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -478,6 +478,23 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		ED9E81AF2012341B000D8632 /* SwiftLint */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = SwiftLint;
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		089D29191D50D12200E58C6D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -616,7 +633,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0.1;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -663,7 +680,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
-				SWIFT_VERSION = 3.0.1;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -673,9 +690,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = SplashBuddy/Resources/SplashBuddy.entitlements;
 				CODE_SIGN_IDENTITY = "Mac Developer";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = 5G89W3T34F;
 				INFOPLIST_FILE = "$(SRCROOT)/SplashBuddy/Resources/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
@@ -693,10 +710,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = SplashBuddy/Resources/SplashBuddy.entitlements;
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "Developer ID Application";
+				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = 5G89W3T34F;
 				INFOPLIST_FILE = "$(SRCROOT)/SplashBuddy/Resources/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;