Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-09-10 22:54:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

Additional fixes for linux installers

Browse source
This commit is contained in:
Ben Gotow 2017-08-11 01:48:56 -07:00
parent d7b459e839
commit 46f5ddf36a
5 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/build/resources/linux/debian/lintian-overrides
View file

@ -1,9 +1,9 @@
nylas: arch-dependent-file-in-usr-share merani: arch-dependent-file-in-usr-share
nylas: changelog-file-missing-in-native-package merani: changelog-file-missing-in-native-package
nylas: copyright-file-contains-full-apache-2-license merani: copyright-file-contains-full-apache-2-license
nylas: copyright-should-refer-to-common-license-file-for-apache-2 merani: copyright-should-refer-to-common-license-file-for-apache-2
nylas: copyright-should-refer-to-common-license-file-for-lgpl merani: copyright-should-refer-to-common-license-file-for-lgpl
nylas: embedded-library merani: embedded-library
nylas: package-installs-python-bytecode merani: package-installs-python-bytecode
nylas: unstripped-binary-or-object merani: unstripped-binary-or-object
nylas: extra-license-file merani: extra-license-file

16
app/build/resources/linux/debian/postinst
View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# postinst script for Nylas # postinst script for merani
# #
# see: dh_installdeb(1) # see: dh_installdeb(1)
@ -15,7 +15,7 @@
# for details, see http://www.debian.org/doc/debian-policy/ or # for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package # the debian-policy package
UBUNTU_CODENAMES="precise trusty utopic vivid" # "xenial is not yet available in nylas repos." UBUNTU_CODENAMES="precise trusty utopic vivid" # "xenial is not yet available in merani repos."
DEBIAN_CODENAMES="squeeze wheezy jessie sid" DEBIAN_CODENAMES="squeeze wheezy jessie sid"
case "$1" in case "$1" in
@ -31,12 +31,12 @@ case "$1" in
DISTS=$DEBIAN_CODENAMES DISTS=$DEBIAN_CODENAMES
DISTRO="debian" DISTRO="debian"
else else
echo "You are not running Debian, Ubuntu, ElementaryOS or LinuxMint. Not adding Nylas repository." echo "You are not running Debian, Ubuntu, ElementaryOS or LinuxMint. Not adding merani repository."
DISTRO="" DISTRO=""
fi fi
if [ -n "$DISTRO" ]; then if [ -n "$DISTRO" ]; then
# Add the Nylas repository. # Add the merani repository.
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2009 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license. # Use of this source code is governed by a BSD-style license.
@ -92,7 +92,7 @@ KEYDATA
fi fi
done done
REPOCONFIG="deb [arch=i386,amd64] http://apt.nylas.com/$DISTRO $REPO main" REPOCONFIG="deb [arch=i386,amd64] http://apt.getmerani.com/$DISTRO $REPO main"
APT_GET="`which apt-get 2> /dev/null`" APT_GET="`which apt-get 2> /dev/null`"
APT_CONFIG="`which apt-config 2> /dev/null`" APT_CONFIG="`which apt-config 2> /dev/null`"
@ -113,7 +113,7 @@ KEYDATA
APT_SOURCESDIR="$APTDIR$APTETC$(apt_config_val 'Dir::Etc::sourceparts')" APT_SOURCESDIR="$APTDIR$APTETC$(apt_config_val 'Dir::Etc::sourceparts')"
} }
# Add the Nylas repository to the apt sources. # Add the merani repository to the apt sources.
# Returns: # Returns:
# 0 - no update necessary # 0 - no update necessary
# 1 - sources were updated # 1 - sources were updated
@ -127,13 +127,13 @@ KEYDATA
if [ -d "$APT_SOURCESDIR" ]; then if [ -d "$APT_SOURCESDIR" ]; then
# Nothing to do if it's already there. # Nothing to do if it's already there.
SOURCELIST=$(grep -H "$REPOCONFIG" "$APT_SOURCESDIR/nylas.list" \ SOURCELIST=$(grep -H "$REPOCONFIG" "$APT_SOURCESDIR/merani.list" \
2>/dev/null | cut -d ':' -f 1) 2>/dev/null | cut -d ':' -f 1)
if [ -n "$SOURCELIST" ]; then if [ -n "$SOURCELIST" ]; then
return 0 return 0
fi fi
printf "$REPOCONFIG\n" > "$APT_SOURCESDIR/nylas.list" printf "$REPOCONFIG\n" > "$APT_SOURCESDIR/merani.list"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
return 1 return 1
fi fi

4
app/build/resources/linux/debian/postrm
View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# Remove the Nylas repository. # Remove the merani repository.
# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Copyright (c) 2009 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license. # Use of this source code is governed by a BSD-style license.
@ -46,7 +46,7 @@ clean_sources_lists() {
find_apt_sources find_apt_sources
if [ -d "$APT_SOURCESDIR" ]; then if [ -d "$APT_SOURCESDIR" ]; then
rm -f "$APT_SOURCESDIR/nylas.list" rm -f "$APT_SOURCESDIR/merani.list"
fi fi
return 0 return 0

2
app/build/resources/linux/merani.desktop.in
View file

@ -8,4 +8,4 @@ Type=Application
StartupNotify=true StartupNotify=true
StartupWMClass=<%= productName %> StartupWMClass=<%= productName %>
Categories=GNOME;GTK;Network;Email;Utility;Development; Categories=GNOME;GTK;Network;Email;Utility;Development;
MimeType=text/plain;x-scheme-handler/mailto;x-scheme-handler/nylas; MimeType=text/plain;x-scheme-handler/mailto;x-scheme-handler/merani;

4
app/script/mkdeb
View file

@ -31,7 +31,7 @@ cp "$LINUX_ASSETS_DIRECTORY/debian/postinst" "$TARGET/DEBIAN/postinst"
cp "$LINUX_ASSETS_DIRECTORY/debian/postrm" "$TARGET/DEBIAN/postrm" cp "$LINUX_ASSETS_DIRECTORY/debian/postrm" "$TARGET/DEBIAN/postrm"
mkdir -m $FILE_MODE -p "$TARGET/usr/bin" mkdir -m $FILE_MODE -p "$TARGET/usr/bin"
ln -s "../share/merani/nylas" "$TARGET/usr/bin/merani" ln -s "../share/merani/merani" "$TARGET/usr/bin/merani"
chmod +x "$TARGET/usr/bin/merani" chmod +x "$TARGET/usr/bin/merani"
mkdir -m $FILE_MODE -p "$TARGET/usr/share/applications" mkdir -m $FILE_MODE -p "$TARGET/usr/share/applications"
@ -61,5 +61,5 @@ chmod -R g-w "$TARGET";
find "$TARGET" -type f -name "*.node" -exec chmod a-x {} \; find "$TARGET" -type f -name "*.node" -exec chmod a-x {} \;
fakeroot dpkg-deb -b "$TARGET" fakeroot dpkg-deb -b "$TARGET"
mv "$TARGET_ROOT/nylas-$VERSION-$ARCH.deb" "$OUTPUT_PATH" mv "$TARGET_ROOT/merani-$VERSION-$ARCH.deb" "$OUTPUT_PATH"
rm -rf "$TARGET_ROOT" rm -rf "$TARGET_ROOT"