Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

small fixes in documentation #3383

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

small fixes in documentation #3383

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5ec1d48
fix(linux-build): Change package name to Nylas Mail
spang Feb 16, 2017
51ecc4a
fix(cli): s/n1/nylas-mail/
spang Feb 16, 2017
c745ec4
fix(linux-build): Update rpm spec to use new package name
spang Feb 17, 2017
7890b92
update(changelog)
jstejada Feb 17, 2017
0a100dd
Update changelog
jstejada Feb 23, 2017
52452d6
Fix broken image url in README.md (#3349)
binhonglee Apr 12, 2017
9981004
inserted missing whitespaces before and after code-blocks and hrefs.
c-steindl Apr 13, 2017
ba8ce47
changed not working link
c-steindl Apr 13, 2017
2d850c9
fixed broken reference to image
c-steindl Apr 13, 2017
81d0553
restored deleted screenshot for readme.
c-steindl Apr 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(linux-build): Change package name to Nylas Mail 
Need this in order to allow parallel installation of Nylas Pro and Nylas
Mail.
  • Loading branch information
@spang
spang committed Feb 16, 2017
commit 5ec1d4868472a8284d9bc0bb4525924599c41fb0
4 changes: 2 additions & 2 deletions build/resources/linux/nylas.desktop.in → build/resources/linux/nylas-mail.desktop.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Name=<%= productName %>
Comment=<%= description %>
GenericName=<%= productName %>
Exec=<%= linuxShareDir %>/nylas %U
Icon=nylas
Exec=/usr/bin/nylas-mail %U
Icon=nylas-mail
Type=Application
StartupNotify=true
StartupWMClass=<%= productName %>
Expand Down
115 changes: 0 additions & 115 deletions build/resources/linux/nylas.sh
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions build/tasks/installer-linux-task.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module.exports = (grunt) => {
writeFromTemplate(specInFilePath, templateData)

// This populates nylas.desktop
const desktopInFilePath = path.join(linuxAssetsDir, 'nylas.desktop.in')
const desktopInFilePath = path.join(linuxAssetsDir, 'nylas-mail.desktop.in')
writeFromTemplate(desktopInFilePath, templateData)

const cmd = path.join('script', 'mkrpm')
Expand Down Expand Up @@ -92,14 +92,14 @@ module.exports = (grunt) => {
name: grunt.config('appJSON').name,
description: grunt.config('appJSON').description,
productName: grunt.config('appJSON').productName,
linuxShareDir: '/usr/share/nylas',
linuxShareDir: '/usr/share/nylas-mail',
arch: arch,
section: 'devel',
maintainer: 'Nylas Team <[email protected]>',
installedSize: installedSize,
}
writeFromTemplate(path.join(linuxAssetsDir, 'debian', 'control.in'), data)
writeFromTemplate(path.join(linuxAssetsDir, 'nylas.desktop.in'), data)
writeFromTemplate(path.join(linuxAssetsDir, 'nylas-mail.desktop.in'), data)

const icon = path.join('build', 'resources', 'nylas.png')
const cmd = path.join('script', 'mkdeb');
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "nylas",
"name": "nylas-mail",
"productName": "Nylas Mail",
"version": "1.0.28",
"description": "The best email app for people and teams at work",
Expand Down
20 changes: 10 additions & 10 deletions script/mkdeb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ TARGET="$TARGET_ROOT/nylas-$VERSION-$ARCH"

mkdir -m $FILE_MODE -p "$TARGET/usr"
mkdir -m $FILE_MODE -p "$TARGET/usr/share"
cp -r "$APP_CONTENTS_DIRECTORY" "$TARGET/usr/share/nylas"
cp -r "$APP_CONTENTS_DIRECTORY" "$TARGET/usr/share/nylas-mail"

mkdir -m $FILE_MODE -p "$TARGET/DEBIAN"
cp "$OUTPUT_PATH/control" "$TARGET/DEBIAN/control"
Expand All @@ -31,28 +31,28 @@ cp "$LINUX_ASSETS_DIRECTORY/debian/postinst" "$TARGET/DEBIAN/postinst"
cp "$LINUX_ASSETS_DIRECTORY/debian/postrm" "$TARGET/DEBIAN/postrm"

mkdir -m $FILE_MODE -p "$TARGET/usr/bin"
cp "$LINUX_ASSETS_DIRECTORY/nylas.sh" "$TARGET/usr/bin/nylas"
chmod +x "$TARGET/usr/bin/nylas"
ln -s "../share/nylas-mail/nylas" "$TARGET/usr/bin/nylas-mail"
chmod +x "$TARGET/usr/bin/nylas-mail"

mkdir -m $FILE_MODE -p "$TARGET/usr/share/applications"
cp "$OUTPUT_PATH/nylas.desktop" "$TARGET/usr/share/applications"
cp "$OUTPUT_PATH/nylas-mail.desktop" "$TARGET/usr/share/applications"

mkdir -m $FILE_MODE -p "$TARGET/usr/share/pixmaps"
cp "$ICON_FILE" "$TARGET/usr/share/pixmaps"
cp "$ICON_FILE" "$TARGET/usr/share/pixmaps/nylas-mail.png"

mkdir -m $FILE_MODE -p "$TARGET/usr/share/icons/hicolor"
for i in 256 128 64 32 16; do
mkdir -p "$TARGET/usr/share/icons/hicolor/${i}x${i}/apps"
cp "$LINUX_ASSETS_DIRECTORY/icons/${i}.png" "$TARGET/usr/share/icons/hicolor/${i}x${i}/apps/nylas.png"
cp "$LINUX_ASSETS_DIRECTORY/icons/${i}.png" "$TARGET/usr/share/icons/hicolor/${i}x${i}/apps/nylas-mail.png"
done

# Copy generated LICENSE.md to /usr/share/doc/nylas/copyright
mkdir -m $FILE_MODE -p "$TARGET/usr/share/doc/nylas"
cp "$TARGET/usr/share/nylas/LICENSE" "$TARGET/usr/share/doc/nylas/copyright"
# Copy generated LICENSE.md to /usr/share/doc/nylas-mail/copyright
mkdir -m $FILE_MODE -p "$TARGET/usr/share/doc/nylas-mail"
cp "$TARGET/usr/share/nylas-mail/LICENSE" "$TARGET/usr/share/doc/nylas-mail/copyright"

# Add lintian overrides
mkdir -m $FILE_MODE -p "$TARGET/usr/share/lintian/overrides"
cp "$ROOT/build/resources/linux/debian/lintian-overrides" "$TARGET/usr/share/lintian/overrides/nylas"
cp "$ROOT/build/resources/linux/debian/lintian-overrides" "$TARGET/usr/share/lintian/overrides/nylas-mail"

# Remove group write from all files
chmod -R g-w "$TARGET";
Expand Down