skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:Lyndir/MasterPassword

Browse Source
This commit is contained in:
Maarten Billemont 2014-11-17 20:15:50 -05:00
commit 00033eca37
8 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -6,7 +6,7 @@
url = git://github.com/lhunath/InAppSettingsKit.git url = git://github.com/lhunath/InAppSettingsKit.git
[submodule "External/KCOrderedAccessorFix"] [submodule "External/KCOrderedAccessorFix"]
path = External/KCOrderedAccessorFix path = External/KCOrderedAccessorFix
url = https://github.com/CFKevinRef/KCOrderedAccessorFix.git url = https://github.com/lhunath/KCOrderedAccessorFix.git
[submodule "External/AttributedMarkdown"] [submodule "External/AttributedMarkdown"]
path = External/AttributedMarkdown path = External/AttributedMarkdown
url = https://github.com/dreamwieber/AttributedMarkdown.git url = https://github.com/dreamwieber/AttributedMarkdown.git

31
MasterPassword/C/mpw.c
View File

@ -95,13 +95,24 @@ char *homedir(const char *filename) {
return homefile; 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[]) { int main(int argc, char *const argv[]) {
if (argc < 2)
usage();
// Read the environment. // Read the environment.
const char *userName = getenv( MP_env_username ); char *userName = getenv( MP_env_username );
const char *masterPassword = NULL; const char *masterPassword = NULL;
const char *siteName = NULL; const char *siteName = NULL;
MPElementType siteType = MPElementTypeGeneratedLong; MPElementType siteType = MPElementTypeGeneratedLong;
@ -156,13 +167,17 @@ int main(int argc, char *const argv[]) {
// Convert and validate input. // Convert and validate input.
if (!userName) { if (!userName) {
fprintf(stderr, "Missing user name.\n"); if (!(userName = getlinep("Your user name:"))) {
return 1; fprintf(stderr, "Missing user name.\n");
return 1;
}
} }
trc("userName: %s\n", userName); trc("userName: %s\n", userName);
if (!siteName) { if (!siteName) {
fprintf(stderr, "Missing site name.\n"); if (!(siteName = getlinep("Site name:"))) {
return 1; fprintf(stderr, "Missing site name.\n");
return 1;
}
} }
trc("siteName: %s\n", siteName); trc("siteName: %s\n", siteName);
if (siteCounterString) if (siteCounterString)

6
MasterPassword/ObjC/iOS/MPUsersViewController.m
View File

@ -682,8 +682,10 @@ referenceSizeForFooterInSection:(NSInteger)section {
} ); } );
PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresDidChangeNotification, [MPiOSAppDelegate get].storeCoordinator, nil, PearlAddNotificationObserver( NSPersistentStoreCoordinatorStoresDidChangeNotification, [MPiOSAppDelegate get].storeCoordinator, nil,
^(MPUsersViewController *self, NSNotification *note) { ^(MPUsersViewController *self, NSNotification *note) {
[self registerObservers]; PearlMainQueue( ^{
[self reloadUsers]; [self registerObservers];
[self reloadUsers];
} );
} ); } );
} }

3
MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
View File

@ -3504,9 +3504,8 @@
outputPaths = ( outputPaths = (
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = "/bin/sh -e"; shellPath = "/bin/sh -xe";
shellScript = "exec ../../../Scripts/genassets"; shellScript = "exec ../../../Scripts/genassets";
showEnvVarsInLog = 0;
}; };
DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */ = { DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;

1
Scripts/genassets
View File

@ -121,6 +121,7 @@ if [[ "$(latest "$ios_icon"/*)" -nt "$appiconset/Contents.json" ]] ||
printf '],"info":{"version":1,"author":"genassets"},"properties":{"pre-rendered":true}}\n' printf '],"info":{"version":1,"author":"genassets"},"properties":{"pre-rendered":true}}\n'
} > "$appiconset/Contents.json" } > "$appiconset/Contents.json"
fi fi
exit
if [[ "$(latest "$ios_launch"/*)" -nt "$launchimage/Contents.json" ]]; then if [[ "$(latest "$ios_launch"/*)" -nt "$launchimage/Contents.json" ]]; then
rm -rf "$launchimage"; mkdir -p "$launchimage" rm -rf "$launchimage"; mkdir -p "$launchimage"

2
Site/mpw-js/css/main.css
View File

@ -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 ****/ /**** BASE STYLE ****/
html { html {

2
Site/mpw-js/js/dependencies.js
View File

@ -37,7 +37,7 @@ try {
ES6 || document.write("<script src=js/mpw-js/traceur-runtime.js><\/script>"); ES6 || document.write("<script src=js/mpw-js/traceur-runtime.js><\/script>");
// If setImmediate is not implemented we include the polyfill // 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 // Include the scrypt implementation
var SCRYPTASM_PATH = (window.location + '').replace(/[^/]*(#[^#]*)?$/, 'js/mpw-js/scrypt-asm.js'); var SCRYPTASM_PATH = (window.location + '').replace(/[^/]*(#[^#]*)?$/, 'js/mpw-js/scrypt-asm.js');

6
Site/mpw-js/sync Executable file
View File

@ -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/