mirror of
https://github.com/zed-industries/zed.git
synced 2025-02-03 17:44:30 +00:00
Merge pull request #2280 from zed-industries/terms
Add terms of use to DMG in the bundle script
This commit is contained in:
commit
2db8ac4a6f
3 changed files with 1585 additions and 4 deletions
|
@ -8,12 +8,12 @@ open_result=false
|
||||||
|
|
||||||
# If -o option is specified, the folder of the resulting dmg will be opened in finder
|
# If -o option is specified, the folder of the resulting dmg will be opened in finder
|
||||||
# If -d is specified, Zed will be compiled in debug mode and the application's path printed
|
# If -d is specified, Zed will be compiled in debug mode and the application's path printed
|
||||||
# If -od or -do is specified Zed will be bundled in debug and the application will be run.
|
# If -od or -do is specified Zed will be bundled in debug and the application will be run.
|
||||||
while getopts 'od' flag
|
while getopts 'od' flag
|
||||||
do
|
do
|
||||||
case "${flag}" in
|
case "${flag}" in
|
||||||
o) open_result=true;;
|
o) open_result=true;;
|
||||||
d)
|
d)
|
||||||
build_flag="";
|
build_flag="";
|
||||||
target_dir="debug"
|
target_dir="debug"
|
||||||
;;
|
;;
|
||||||
|
@ -119,12 +119,16 @@ hdiutil create -volname Zed -srcfolder "${dmg_source_directory}" -ov -format UDZ
|
||||||
# This symlink causes CPU issues with Zed if the Zed codebase is the project being worked on, so we simply remove it for now.
|
# This symlink causes CPU issues with Zed if the Zed codebase is the project being worked on, so we simply remove it for now.
|
||||||
rm ${dmg_source_directory}/Applications
|
rm ${dmg_source_directory}/Applications
|
||||||
|
|
||||||
|
echo "Adding license agreement to DMG"
|
||||||
|
npm install --global dmg-license minimist
|
||||||
|
dmg-license script/terms/terms-of-use.json "${dmg_file_path}"
|
||||||
|
|
||||||
if [[ -n $MACOS_CERTIFICATE && -n $MACOS_CERTIFICATE_PASSWORD && -n $APPLE_NOTARIZATION_USERNAME && -n $APPLE_NOTARIZATION_PASSWORD ]]; then
|
if [[ -n $MACOS_CERTIFICATE && -n $MACOS_CERTIFICATE_PASSWORD && -n $APPLE_NOTARIZATION_USERNAME && -n $APPLE_NOTARIZATION_PASSWORD ]]; then
|
||||||
echo "Notarizing DMG with Apple"
|
echo "Notarizing DMG with Apple"
|
||||||
npm install -g notarize-cli
|
npm install -g notarize-cli
|
||||||
npx notarize-cli --file ${dmg_file_path} --bundle-id dev.zed.Zed --username "$APPLE_NOTARIZATION_USERNAME" --password "$APPLE_NOTARIZATION_PASSWORD"
|
npx notarize-cli --file "${dmg_file_path}" --bundle-id dev.zed.Zed --username "$APPLE_NOTARIZATION_USERNAME" --password "$APPLE_NOTARIZATION_PASSWORD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$open_result" = true ]; then
|
if [ "$open_result" = true ]; then
|
||||||
open $dmg_target_directory
|
open $dmg_target_directory
|
||||||
fi
|
fi
|
||||||
|
|
9
script/terms/terms-of-use.json
Normal file
9
script/terms/terms-of-use.json
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
"body": [
|
||||||
|
{
|
||||||
|
"lang": "en-US",
|
||||||
|
"type": "rtf",
|
||||||
|
"file": "terms-of-use.rtf"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
1568
script/terms/terms-of-use.rtf
Normal file
1568
script/terms/terms-of-use.rtf
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue