More path updates changing build asset names

This commit is contained in:
Ben Gotow 2017-08-11 01:29:14 -07:00
parent 68d654f677
commit 2df22d1787
3 changed files with 24 additions and 24 deletions

View file

@ -18,11 +18,11 @@ FILE_MODE=755
TARGET_ROOT="`mktemp -d`"
chmod $FILE_MODE "$TARGET_ROOT"
TARGET="$TARGET_ROOT/nylas-$VERSION-$ARCH"
TARGET="$TARGET_ROOT/merani-$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-mail"
cp -r "$APP_CONTENTS_DIRECTORY" "$TARGET/usr/share/merani"
mkdir -m $FILE_MODE -p "$TARGET/DEBIAN"
cp "$OUTPUT_PATH/control" "$TARGET/DEBIAN/control"
@ -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"
ln -s "../share/nylas-mail/nylas" "$TARGET/usr/bin/nylas-mail"
chmod +x "$TARGET/usr/bin/nylas-mail"
ln -s "../share/merani/nylas" "$TARGET/usr/bin/merani"
chmod +x "$TARGET/usr/bin/merani"
mkdir -m $FILE_MODE -p "$TARGET/usr/share/applications"
cp "$OUTPUT_PATH/nylas-mail.desktop" "$TARGET/usr/share/applications"
cp "$OUTPUT_PATH/merani.desktop" "$TARGET/usr/share/applications"
mkdir -m $FILE_MODE -p "$TARGET/usr/share/pixmaps"
cp "$ICON_FILE" "$TARGET/usr/share/pixmaps/nylas-mail.png"
cp "$ICON_FILE" "$TARGET/usr/share/pixmaps/merani.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-mail.png"
cp "$LINUX_ASSETS_DIRECTORY/icons/${i}.png" "$TARGET/usr/share/icons/hicolor/${i}x${i}/apps/merani.png"
done
# 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"
# Copy generated LICENSE.md to /usr/share/doc/merani/copyright
mkdir -m $FILE_MODE -p "$TARGET/usr/share/doc/merani"
cp "$TARGET/usr/share/merani/LICENSE" "$TARGET/usr/share/doc/merani/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-mail"
cp "$ROOT/build/resources/linux/debian/lintian-overrides" "$TARGET/usr/share/lintian/overrides/merani"
# Remove group write from all files
chmod -R g-w "$TARGET";

View file

@ -21,10 +21,10 @@ mkdir -p $RPM_BUILD_ROOT/RPMS
cp -r "$APP_CONTENTS_DIRECTORY/"* "$RPM_BUILD_ROOT/BUILD"
cp -r "$LINUX_ASSETS_DIRECTORY/icons" "$RPM_BUILD_ROOT/BUILD"
cp "$BUILD_DIRECTORY/nylas.spec" "$RPM_BUILD_ROOT/SPECS"
cp "$BUILD_DIRECTORY/nylas-mail.desktop" "$RPM_BUILD_ROOT/BUILD"
cp "$BUILD_DIRECTORY/merani.spec" "$RPM_BUILD_ROOT/SPECS"
cp "$BUILD_DIRECTORY/merani.desktop" "$RPM_BUILD_ROOT/BUILD"
rpmbuild -ba "$BUILD_DIRECTORY/nylas.spec"
cp $RPM_BUILD_ROOT/RPMS/$ARCH/nylas-*.rpm "$BUILD_DIRECTORY"
rpmbuild -ba "$BUILD_DIRECTORY/merani.spec"
cp $RPM_BUILD_ROOT/RPMS/$ARCH/merani-*.rpm "$BUILD_DIRECTORY"
rm -rf "$RPM_BUILD_ROOT"

View file

@ -52,18 +52,18 @@ class SystemStartServiceDarwin extends SystemStartServiceBase {
}
_launcherPath() {
return path.join("/", "Applications", "Nylas Mail.app", "Contents",
"MacOS", "Nylas")
return path.join("/", "Applications", "Merani.app", "Contents",
"MacOS", "Merani")
}
_plistPath() {
return path.join(process.env.HOME, "Library",
"LaunchAgents", "com.nylas.plist");
"LaunchAgents", "com.merani.plist");
}
_launchdPlist() {
return {
Label: "com.nylas.n1",
Label: "com.merani.merani",
Program: this._launcherPath(),
ProgramArguments: ["--background"],
RunAtLoad: true,
@ -91,7 +91,7 @@ class SystemStartServiceWin32 extends SystemStartServiceBase {
configureToLaunchOnSystemStart() {
ws.create(this._shortcutPath(), {
target: this._launcherPath(),
args: "--processStart=nylas.exe --process-start-args=--background",
args: "--processStart=merani.exe --process-start-args=--background",
runStyle: ws.MIN,
desc: "An extensible, open-source mail client built on the modern web.",
}, (err) => {
@ -104,12 +104,12 @@ class SystemStartServiceWin32 extends SystemStartServiceBase {
}
_launcherPath() {
return path.join(process.env.LOCALAPPDATA, "nylas", "Update.exe")
return path.join(process.env.LOCALAPPDATA, "merani", "Update.exe")
}
_shortcutPath() {
return path.join(process.env.APPDATA, "Microsoft", "Windows",
"Start Menu", "Programs", "Startup", "Nylas.lnk")
"Start Menu", "Programs", "Startup", "Merani.lnk")
}
}
@ -144,12 +144,12 @@ class SystemStartServiceLinux extends SystemStartServiceBase {
}
_launcherPath() {
return path.join('/', 'usr', 'share', 'applications', 'nylas.desktop');
return path.join('/', 'usr', 'share', 'applications', 'merani.desktop');
}
_shortcutPath() {
const configDir = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config');
return path.join(configDir, 'autostart', 'nylas-mail.desktop');
return path.join(configDir, 'autostart', 'merani.desktop');
}
}