diff --git a/Medis.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Electron Framework b/Medis.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Electron Framework index f60dac4e..3c0b837e 100755 Binary files a/Medis.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Electron Framework and b/Medis.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Electron Framework differ diff --git a/Medis.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libnode.dylib b/Medis.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libnode.dylib index d222d3ec..c286aa27 100755 Binary files a/Medis.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libnode.dylib and b/Medis.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libnode.dylib differ diff --git a/Medis.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Info.plist b/Medis.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Info.plist index 08005f4c..6a48ba6a 100644 --- a/Medis.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Info.plist +++ b/Medis.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Info.plist @@ -17,9 +17,9 @@ DTSDKName macosx10.11 DTXcode - 0710 + 0701 DTXcodeBuild - 7B91b + 7A1001 NSSupportsAutomaticGraphicsSwitching diff --git a/Medis.app/Contents/Frameworks/Medis Helper EH.app/Contents/Info.plist b/Medis.app/Contents/Frameworks/Medis Helper EH.app/Contents/Info.plist index 6fcd78e9..3f773a27 100644 --- a/Medis.app/Contents/Frameworks/Medis Helper EH.app/Contents/Info.plist +++ b/Medis.app/Contents/Frameworks/Medis Helper EH.app/Contents/Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable Medis Helper EH CFBundleIdentifier - li.zihua.medis.helper.EH + li.zihua.medis.helper.EH CFBundleName Medis Helper EH CFBundlePackageType @@ -19,9 +19,9 @@ DTSDKName macosx10.11 DTXcode - 0710 + 0701 DTXcodeBuild - 7B91b + 7A1001 LSUIElement NSSupportsAutomaticGraphicsSwitching diff --git a/Medis.app/Contents/Frameworks/Medis Helper EH.app/Contents/MacOS/Medis Helper EH b/Medis.app/Contents/Frameworks/Medis Helper EH.app/Contents/MacOS/Medis Helper EH index 81f0a8b5..6b8cdcbd 100755 Binary files a/Medis.app/Contents/Frameworks/Medis Helper EH.app/Contents/MacOS/Medis Helper EH and b/Medis.app/Contents/Frameworks/Medis Helper EH.app/Contents/MacOS/Medis Helper EH differ diff --git a/Medis.app/Contents/Frameworks/Medis Helper NP.app/Contents/Info.plist b/Medis.app/Contents/Frameworks/Medis Helper NP.app/Contents/Info.plist index 90b1ab8a..e473b7a2 100644 --- a/Medis.app/Contents/Frameworks/Medis Helper NP.app/Contents/Info.plist +++ b/Medis.app/Contents/Frameworks/Medis Helper NP.app/Contents/Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable Medis Helper NP CFBundleIdentifier - li.zihua.medis.helper.NP + li.zihua.medis.helper.NP CFBundleName Medis Helper NP CFBundlePackageType @@ -19,9 +19,9 @@ DTSDKName macosx10.11 DTXcode - 0710 + 0701 DTXcodeBuild - 7B91b + 7A1001 LSUIElement NSSupportsAutomaticGraphicsSwitching diff --git a/Medis.app/Contents/Frameworks/Medis Helper NP.app/Contents/MacOS/Medis Helper NP b/Medis.app/Contents/Frameworks/Medis Helper NP.app/Contents/MacOS/Medis Helper NP index f2408ccb..154b8e71 100755 Binary files a/Medis.app/Contents/Frameworks/Medis Helper NP.app/Contents/MacOS/Medis Helper NP and b/Medis.app/Contents/Frameworks/Medis Helper NP.app/Contents/MacOS/Medis Helper NP differ diff --git a/Medis.app/Contents/Frameworks/Medis Helper.app/Contents/Info.plist b/Medis.app/Contents/Frameworks/Medis Helper.app/Contents/Info.plist index cc7d98d1..5d86da02 100644 --- a/Medis.app/Contents/Frameworks/Medis Helper.app/Contents/Info.plist +++ b/Medis.app/Contents/Frameworks/Medis Helper.app/Contents/Info.plist @@ -5,7 +5,7 @@ BuildMachineOSBuild 14F1021 CFBundleIdentifier - li.zihua.medis.helper + li.zihua.medis.helper CFBundleName Medis Helper CFBundlePackageType @@ -15,9 +15,9 @@ DTSDKName macosx10.11 DTXcode - 0710 + 0701 DTXcodeBuild - 7B91b + 7A1001 LSUIElement NSSupportsAutomaticGraphicsSwitching diff --git a/Medis.app/Contents/Frameworks/Medis Helper.app/Contents/MacOS/Medis Helper b/Medis.app/Contents/Frameworks/Medis Helper.app/Contents/MacOS/Medis Helper index 45f40036..6b8cdcbd 100755 Binary files a/Medis.app/Contents/Frameworks/Medis Helper.app/Contents/MacOS/Medis Helper and b/Medis.app/Contents/Frameworks/Medis Helper.app/Contents/MacOS/Medis Helper differ diff --git a/Medis.app/Contents/Info.plist b/Medis.app/Contents/Info.plist index 32bdc12b..8a3886df 100644 --- a/Medis.app/Contents/Info.plist +++ b/Medis.app/Contents/Info.plist @@ -5,31 +5,31 @@ BuildMachineOSBuild 14F1021 CFBundleDisplayName - Medis + Medis CFBundleExecutable - Electron + Electron CFBundleIconFile atom.icns CFBundleIdentifier - li.zihua.medis + li.zihua.medis CFBundleInfoDictionaryVersion 6.0 CFBundleName - Medis + Medis CFBundlePackageType APPL CFBundleShortVersionString - 0.1.0 + 0.1.4 CFBundleVersion - 0.1.0 + 0.1.4 DTSDKBuild 15A278 DTSDKName macosx10.11 DTXcode - 0710 + 0701 DTXcodeBuild - 7B91b + 7A1001 LSApplicationCategoryType public.app-category.developer-tools LSMinimumSystemVersion diff --git a/Medis.app/Contents/MacOS/Electron b/Medis.app/Contents/MacOS/Electron index 5d5f9e37..57e6444a 100755 Binary files a/Medis.app/Contents/MacOS/Electron and b/Medis.app/Contents/MacOS/Electron differ diff --git a/Medis.app/Contents/Resources/atom.asar b/Medis.app/Contents/Resources/atom.asar index f1c88ce2..bd725fe8 100644 Binary files a/Medis.app/Contents/Resources/atom.asar and b/Medis.app/Contents/Resources/atom.asar differ diff --git a/Medis.app/Contents/Resources/default_app/index.html b/Medis.app/Contents/Resources/default_app/index.html index e55cdf77..ec16a38b 100644 --- a/Medis.app/Contents/Resources/default_app/index.html +++ b/Medis.app/Contents/Resources/default_app/index.html @@ -76,7 +76,11 @@ }; -

Welcome to Electron

+

+ +

To run your app with Electron, execute the following command under your @@ -87,8 +91,18 @@

Welcome to Electron

The path-to-your-app should be the path to your own Electron - app, you can read the quick start - guide in Electron's docs + app, you can read the + + guide in Electron's + on how to write one.

diff --git a/Medis.app/Contents/Resources/default_app/main.js b/Medis.app/Contents/Resources/default_app/main.js index 3916cfb2..c325aed0 100644 --- a/Medis.app/Contents/Resources/default_app/main.js +++ b/Medis.app/Contents/Resources/default_app/main.js @@ -148,7 +148,11 @@ app.once('ready', function() { }, { label: 'Documentation', - click: function() { shell.openExternal('https://github.com/atom/electron/tree/master/docs#readme') } + click: function() { + shell.openExternal( + `https://github.com/atom/electron/tree/v${process.versions.electron}/docs#readme` + ) + } }, { label: 'Community Discussions', @@ -189,11 +193,11 @@ app.once('ready', function() { { label: 'Hide Others', accelerator: 'Command+Shift+H', - role: 'hideothers:' + role: 'hideothers' }, { label: 'Show All', - role: 'unhide:' + role: 'unhide' }, { type: 'separator' @@ -249,7 +253,11 @@ if (option.file && !option.webdriver) { } catch(e) { if (e.code == 'MODULE_NOT_FOUND') { app.focus(); - dialog.showErrorBox('Error opening app', 'The app provided is not a valid electron app, please read the docs on how to write one:\nhttps://github.com/atom/electron/tree/master/docs\n\n' + e.toString()); + dialog.showErrorBox( + 'Error opening app', + 'The app provided is not a valid Electron app, please read the docs on how to write one:\n' + + `https://github.com/atom/electron/tree/v${process.versions.electron}/docs\n\n${e.toString()}` + ); process.exit(1); } else { console.error('App threw an error when running', e); diff --git a/bin/sign b/bin/sign index 6a623b27..4777b761 100755 --- a/bin/sign +++ b/bin/sign @@ -1,27 +1,36 @@ #!/bin/bash -mkdir sign -cp -r Medis.app sign # Name of your app. APP="Medis" # The path of you app to sign. -APP_PATH="sign/Medis.app" +APP_PATH="sign/$APP.app" # The path to the location you want to put the signed package. RESULT_PATH="$APP.pkg" # The name of certificates you requested. APP_KEY="3rd Party Mac Developer Application: Zihua Li (35DFNA47LC)" INSTALLER_KEY="3rd Party Mac Developer Installer: Zihua Li (35DFNA47LC)" -FRAMEWORKS_PATH="$APP_PATH/Contents/Frameworks" +FW_PATH="$APP_PATH/Contents/Frameworks" + +mkdir sign +cp -a "$APP.app" sign + +echo "Signing..." +codesign --verbose -fs "$APP_KEY" --entitlements child.plist "$FW_PATH/Electron Framework.framework/Libraries/libnode.dylib" +codesign --verbose -fs "$APP_KEY" --entitlements child.plist "$FW_PATH/Electron Framework.framework/Versions/A" +codesign --verbose -fs "$APP_KEY" --entitlements child.plist "$FW_PATH/$APP Helper EH.app" +codesign --verbose -fs "$APP_KEY" --entitlements child.plist "$FW_PATH/$APP Helper NP.app" +codesign --verbose -fs "$APP_KEY" --entitlements child.plist "$FW_PATH/$APP Helper.app" +codesign --verbose -fs "$APP_KEY" --entitlements parent.plist "$APP_PATH" + +echo "" +echo "Verifying signatures..." +codesign --verify --deep --display --verbose=4 "$APP_PATH" -codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework/Libraries/libnode.dylib" -codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework/Electron Framework" -codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework/" -codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper.app/" -codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper EH.app/" -codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper NP.app/" -codesign --deep -fs "$APP_KEY" --entitlements child.plist "$APP_PATH/Contents/MacOS/Electron" -codesign --deep -fs "$APP_KEY" --entitlements parent.plist "$APP_PATH" productbuild --component "$APP_PATH" /Applications --sign "$INSTALLER_KEY" "$RESULT_PATH" -# rm -rf sign +# echo "" +# echo "Veriyfing Gatekeeper acceptance..." +# spctl --ignore-cache --no-cache --assess --type execute --verbose=4 "$APP_PATH" + +rm -rf sign diff --git a/bin/tomedis b/bin/tomedis new file mode 100755 index 00000000..0a8edf6d --- /dev/null +++ b/bin/tomedis @@ -0,0 +1,26 @@ +#!/bin/bash + +APP_PATH="Medis.app" +FRAMEWORKS_PATH="$APP_PATH/Contents/Frameworks" + +perl -pi -e 's/Electron/Medis/g' "$APP_PATH/Contents/Info.plist" +perl -pi -e 's/com.github.electron/li.zihua.medis/g' "$APP_PATH/Contents/Info.plist" +mv "$FRAMEWORKS_PATH/Electron Helper EH.app" "$FRAMEWORKS_PATH/Medis Helper EH.app" +mv "$FRAMEWORKS_PATH/Electron Helper NP.app" "$FRAMEWORKS_PATH/Medis Helper NP.app" +mv "$FRAMEWORKS_PATH/Electron Helper.app" "$FRAMEWORKS_PATH/Medis Helper.app" + +perl -pi -e 's/Electron/Medis/g' "$FRAMEWORKS_PATH/Medis Helper EH.app/Contents/Info.plist" +perl -pi -e 's/Electron/Medis/g' "$FRAMEWORKS_PATH/Medis Helper NP.app/Contents/Info.plist" +perl -pi -e 's/Electron/Medis/g' "$FRAMEWORKS_PATH/Medis Helper.app/Contents/Info.plist" + +perl -pi -e 's/com.github.electron/li.zihua.medis/g' "$FRAMEWORKS_PATH/Medis Helper EH.app/Contents/Info.plist" +perl -pi -e 's/com.github.electron/li.zihua.medis/g' "$FRAMEWORKS_PATH/Medis Helper NP.app/Contents/Info.plist" +perl -pi -e 's/com.github.electron/li.zihua.medis/g' "$FRAMEWORKS_PATH/Medis Helper.app/Contents/Info.plist" + +rm "$APP_PATH/Contents/Resources/atom.icns" +# rm "$APP_PATH/Contents/Resources/atom.asar" +cp "icns/MyIcon.icns" "$APP_PATH/Contents/Resources/atom.icns" + +mv "$FRAMEWORKS_PATH/Medis Helper EH.app/Contents/MacOS/Electron Helper EH" "$FRAMEWORKS_PATH/Medis Helper EH.app/Contents/MacOS/Medis Helper EH" +mv "$FRAMEWORKS_PATH/Medis Helper NP.app/Contents/MacOS/Electron Helper NP" "$FRAMEWORKS_PATH/Medis Helper NP.app/Contents/MacOS/Medis Helper NP" +mv "$FRAMEWORKS_PATH/Medis Helper.app/Contents/MacOS/Electron Helper" "$FRAMEWORKS_PATH/Medis Helper.app/Contents/MacOS/Medis Helper" diff --git a/package.json b/package.json index a761a3ae..188e2566 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "dev": "webpack --progress --colors --watch", "deploy": "NODE_ENV=production ./bin/deploy", "sign": "./bin/sign", - "unsign": "./bin/unsign" + "unsign": "./bin/unsign", + "tomedis": "./bin/tomedis" }, "dependencies": { "fixed-data-table-contextmenu": "^0.6.3", diff --git a/parent.plist b/parent.plist index 8e31f755..f0d23045 100644 --- a/parent.plist +++ b/parent.plist @@ -4,5 +4,11 @@ com.apple.security.app-sandbox + com.apple.security.files.user-selected.read-only + + com.apple.security.network.client + + com.apple.security.network.server +