From c9c9aec9dd886bea1b78a291fc92fd8052615666 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 3 Nov 2014 15:56:46 -0500
Subject: [PATCH 01/10] Sync mpw-js to js.masterpasswordapp.com.

---
 Site/mpw-js/sync | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100755 Site/mpw-js/sync

diff --git a/Site/mpw-js/sync b/Site/mpw-js/sync
new file mode 100755
index 00000000..e46b9a88
--- /dev/null
+++ b/Site/mpw-js/sync
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -e
+
+cd "${BASH_SOURCE[0]%/*}"
+#s3cmd sync --exclude '.git/**' --delete-removed --follow-symlinks --preserve --acl-public --reduced-redundancy . s3://js.masterpasswordapp.com/
+rsync -avP --no-group . satura.lyndir.com:/usr/local/www/js.masterpasswordapp.com/htdocs-secure/

From 96b482d94b8359c92e5de5581c473c14a3e2b2e2 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 3 Nov 2014 16:04:41 -0500
Subject: [PATCH 02/10] KCOrderedAccessorFix was forked.

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 38e1a97e..2d5117c1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
 	url = git://github.com/lhunath/InAppSettingsKit.git
 [submodule "External/KCOrderedAccessorFix"]
 	path = External/KCOrderedAccessorFix
-	url = https://github.com/CFKevinRef/KCOrderedAccessorFix.git
+	url = https://github.com/lhunath/KCOrderedAccessorFix.git
 [submodule "External/AttributedMarkdown"]
 	path = External/AttributedMarkdown
 	url = https://github.com/dreamwieber/AttributedMarkdown.git

From 435d72a5093354057720563011fc4fa845db6203 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 10 Nov 2014 12:35:31 -0500
Subject: [PATCH 03/10] Read the user's name and site name from stdin if not
 given.

---
 MasterPassword/C/mpw.c | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/MasterPassword/C/mpw.c b/MasterPassword/C/mpw.c
index 13994a09..ea286d12 100644
--- a/MasterPassword/C/mpw.c
+++ b/MasterPassword/C/mpw.c
@@ -95,13 +95,24 @@ char *homedir(const char *filename) {
     return homefile;
 }
 
+char *getlinep(const char *prompt) {
+    char *buf = NULL;
+    size_t bufSize = 0;
+    ssize_t lineSize;
+    fprintf(stderr, "%s", prompt);
+    fprintf(stderr, " ");
+    if ((lineSize = getline(&buf, &bufSize, stdin)) < 0) {
+        free(buf);
+        return NULL;
+    }
+    buf[lineSize - 1]=0;
+    return buf;
+}
+
 int main(int argc, char *const argv[]) {
 
-    if (argc < 2)
-        usage();
-
     // Read the environment.
-    const char *userName = getenv( MP_env_username );
+    char *userName = getenv( MP_env_username );
     const char *masterPassword = NULL;
     const char *siteName = NULL;
     MPElementType siteType = MPElementTypeGeneratedLong;
@@ -156,13 +167,17 @@ int main(int argc, char *const argv[]) {
 
     // Convert and validate input.
     if (!userName) {
-        fprintf(stderr, "Missing user name.\n");
-        return 1;
+        if (!(userName = getlinep("Your user name:"))) {
+            fprintf(stderr, "Missing user name.\n");
+            return 1;
+        }
     }
     trc("userName: %s\n", userName);
     if (!siteName) {
-        fprintf(stderr, "Missing site name.\n");
-        return 1;
+        if (!(siteName = getlinep("Site name:"))) {
+            fprintf(stderr, "Missing site name.\n");
+            return 1;
+        }
     }
     trc("siteName: %s\n", siteName);
     if (siteCounterString)

From f0fa350e64e5e29cceb3bdffdd197d4038783e6e Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 10 Nov 2014 16:44:37 -0500
Subject: [PATCH 04/10] Fix mixed content and bad path for
 setImmediate-polyfill.

---
 Site/mpw-js/css/main.css       | 2 +-
 Site/mpw-js/js/dependencies.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Site/mpw-js/css/main.css b/Site/mpw-js/css/main.css
index ed0a108f..336855b9 100644
--- a/Site/mpw-js/css/main.css
+++ b/Site/mpw-js/css/main.css
@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Flamenco:300|Exo+2:400,100,900);
+@import url(://fonts.googleapis.com/css?family=Flamenco:300|Exo+2:400,100,900);
 
 /**** BASE STYLE ****/
 html {
diff --git a/Site/mpw-js/js/dependencies.js b/Site/mpw-js/js/dependencies.js
index 0d54f51c..ebd155ea 100644
--- a/Site/mpw-js/js/dependencies.js
+++ b/Site/mpw-js/js/dependencies.js
@@ -37,7 +37,7 @@ try {
 ES6 || document.write("<script src=js/mpw-js/traceur-runtime.js><\/script>");
 
 // If setImmediate is not implemented we include the polyfill
-window.setImmediate || document.write("<script src=js/" + esdir + "setImmediate-polyfill.js><\/script>");
+window.setImmediate || document.write("<script src=js/mpw-js/" + esdir + "setImmediate-polyfill.js><\/script>");
 
 // Include the scrypt implementation
 var SCRYPTASM_PATH = (window.location + '').replace(/[^/]*(#[^#]*)?$/, 'js/mpw-js/scrypt-asm.js');

From 09d67113a2c2d7e46ef68c99edd5300733d4d49a Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 10 Nov 2014 16:45:25 -0500
Subject: [PATCH 05/10] Fix deadlock when PSC's store becomes available.

---
 MasterPassword/ObjC/iOS/MPUsersViewController.m | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/MasterPassword/ObjC/iOS/MPUsersViewController.m b/MasterPassword/ObjC/iOS/MPUsersViewController.m
index c64d76eb..f25869bc 100644
--- a/MasterPassword/ObjC/iOS/MPUsersViewController.m
+++ b/MasterPassword/ObjC/iOS/MPUsersViewController.m
@@ -682,8 +682,10 @@ referenceSizeForFooterInSection:(NSInteger)section {
             } );
     PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresDidChangeNotification, [MPiOSAppDelegate get].storeCoordinator, nil,
             ^(MPUsersViewController *self, NSNotification *note) {
-                [self registerObservers];
-                [self reloadUsers];
+                PearlMainQueue( ^{
+                    [self registerObservers];
+                    [self reloadUsers];
+                } );
             } );
 }
 

From dbd5265ee06c50a077a9adc47217ba3c8f0313d2 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 17 Nov 2014 17:12:40 -0500
Subject: [PATCH 06/10] Try to debug Travis CI hang on genassets.

---
 .../ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
index cedb53e9..181c68fb 100644
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -3504,9 +3504,8 @@
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = "/bin/sh -e";
+			shellPath = "/bin/sh -xe";
 			shellScript = "exec ../../../Scripts/genassets";
-			showEnvVarsInLog = 0;
 		};
 		DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */ = {
 			isa = PBXShellScriptBuildPhase;

From b6568995327f166ebba7c5ef66b160fa244fd0d5 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 17 Nov 2014 17:28:06 -0500
Subject: [PATCH 07/10] More debug attempts for Travis CI.

---
 .../ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
index 181c68fb..3999c78b 100644
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -3505,7 +3505,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/bin/sh -xe";
-			shellScript = "exec ../../../Scripts/genassets";
+			shellScript = "echo zomg, broken";
 		};
 		DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */ = {
 			isa = PBXShellScriptBuildPhase;

From c0e6e60a38553c49f280552ca0afee54ee8d757a Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 17 Nov 2014 17:35:08 -0500
Subject: [PATCH 08/10] Revert "More debug attempts for Travis CI."

This reverts commit b6568995327f166ebba7c5ef66b160fa244fd0d5.
---
 .../ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
index 3999c78b..181c68fb 100644
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -3505,7 +3505,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/bin/sh -xe";
-			shellScript = "echo zomg, broken";
+			shellScript = "exec ../../../Scripts/genassets";
 		};
 		DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */ = {
 			isa = PBXShellScriptBuildPhase;

From 99f5dfe040db34ccce332f2add12a9f22d714548 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 17 Nov 2014 17:35:39 -0500
Subject: [PATCH 09/10] Try without exec, now will you run it, Travis?

---
 .../ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
index 181c68fb..423f73b0 100644
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -3505,7 +3505,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/bin/sh -xe";
-			shellScript = "exec ../../../Scripts/genassets";
+			shellScript = "../../../Scripts/genassets";
 		};
 		DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */ = {
 			isa = PBXShellScriptBuildPhase;

From 574f2395453ba18a0413e3f0f2d8b4b684534401 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 17 Nov 2014 17:42:32 -0500
Subject: [PATCH 10/10] cut genassets in half to debug Travis.

---
 .../ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj       | 2 +-
 Scripts/genassets                                               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
index 423f73b0..181c68fb 100644
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -3505,7 +3505,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/bin/sh -xe";
-			shellScript = "../../../Scripts/genassets";
+			shellScript = "exec ../../../Scripts/genassets";
 		};
 		DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/Scripts/genassets b/Scripts/genassets
index 53638fbf..584cf41a 100755
--- a/Scripts/genassets
+++ b/Scripts/genassets
@@ -121,6 +121,7 @@ if [[ "$(latest "$ios_icon"/*)" -nt "$appiconset/Contents.json" ]] ||
         printf '],"info":{"version":1,"author":"genassets"},"properties":{"pre-rendered":true}}\n'
     } > "$appiconset/Contents.json"
 fi
+exit
 
 if [[ "$(latest "$ios_launch"/*)" -nt "$launchimage/Contents.json" ]]; then
     rm -rf "$launchimage"; mkdir -p "$launchimage"