[evolution] [Flatpak] Make the .json files valid
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] [Flatpak] Make the .json files valid
- Date: Mon, 15 Jul 2019 10:10:08 +0000 (UTC)
commit 63cef9f95b3b4450b465603fa43824cb068ae72b
Author: Milan Crha <mcrha redhat com>
Date: Mon Jul 15 12:06:37 2019 +0200
[Flatpak] Make the .json files valid
The Flatpak manifest were not valid due to used plain tab character
inside text constants (the tab character can be used inside the JSON
text constant only encoded as \t). This could strike when a strict
JSON parser had been used.
flatpak/org.gnome.Evolution-master.json | 48 ++++++++++++++++-----------------
flatpak/org.gnome.Evolution-stable.json | 48 ++++++++++++++++-----------------
2 files changed, 48 insertions(+), 48 deletions(-)
---
diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json
index bb82b0943b..24dd3ff638 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -302,33 +302,33 @@
"type": "script",
"commands": [
"if [ \"$1\" = \"--quit\" -o \"$1\" = \"--force-shutdown\" ];
then",
- " /app/bin/evolution.bin \"$@\"",
+ " /app/bin/evolution.bin \"$@\"",
"else",
- " export
BOGOFILTER_DIR=\"${XDG_DATA_HOME}/bogofilter/\"",
- " export GIO_USE_NETWORK_MONITOR=base",
- " gsettings reset org.gnome.evolution-data-server
network-monitor-gio-name",
+ " export BOGOFILTER_DIR=\"${XDG_DATA_HOME}/bogofilter/\"",
+ " export GIO_USE_NETWORK_MONITOR=base",
+ " gsettings reset org.gnome.evolution-data-server
network-monitor-gio-name",
"",
- " gpg-agent --homedir ~/.gnupg --daemon
--pinentry-program=/app/bin/pinentry",
+ " gpg-agent --homedir ~/.gnupg --daemon
--pinentry-program=/app/bin/pinentry",
"",
- " LINES=$(gdbus call --session --dest
org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep
@SOURCES_SERVICE@ | wc -l)",
- " if [ \"${LINES}\" = \"0\" ]; then",
- " /app/libexec/evolution-source-registry &",
- " gdbus wait --session --timeout=1@TIMEOUTMULT@
@SOURCES_SERVICE@",
- " fi",
+ " LINES=$(gdbus call --session --dest org.freedesktop.DBus
--object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc
-l)",
+ " if [ \"${LINES}\" = \"0\" ]; then",
+ " /app/libexec/evolution-source-registry &",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@SOURCES_SERVICE@",
+ " fi",
"",
- " LINES=$(gdbus call --session --dest
org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep
@ADDRESSBOOK_SERVICE@ | wc -l)",
- " if [ \"${LINES}\" = \"0\" ]; then",
- " /app/libexec/evolution-addressbook-factory -r
&",
- " gdbus wait --session --timeout=1@TIMEOUTMULT@
@ADDRESSBOOK_SERVICE@",
- " fi",
+ " LINES=$(gdbus call --session --dest org.freedesktop.DBus
--object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @ADDRESSBOOK_SERVICE@ | wc
-l)",
+ " if [ \"${LINES}\" = \"0\" ]; then",
+ " /app/libexec/evolution-addressbook-factory -r &",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@ADDRESSBOOK_SERVICE@",
+ " fi",
"",
- " LINES=$(gdbus call --session --dest
org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep
@CALENDAR_SERVICE@ | wc -l)",
- " if [ \"${LINES}\" = \"0\" ]; then",
- " /app/libexec/evolution-calendar-factory -r &",
- " gdbus wait --session --timeout=1@TIMEOUTMULT@
@CALENDAR_SERVICE@",
- " fi",
+ " LINES=$(gdbus call --session --dest org.freedesktop.DBus
--object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @CALENDAR_SERVICE@ | wc
-l)",
+ " if [ \"${LINES}\" = \"0\" ]; then",
+ " /app/libexec/evolution-calendar-factory -r &",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@CALENDAR_SERVICE@",
+ " fi",
"",
- " /app/bin/evolution.bin \"$@\"",
+ " /app/bin/evolution.bin \"$@\"",
"fi"
],
"dest-filename": "flatpak-evolution-wrapper.sh.in"
@@ -341,9 +341,9 @@
"(`pkg-config --atleast-version 2.60.1 gio-2.0` ||
`pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000",
"",
"sed -e \"s|\\@SOURCES_SERVICE\\@|$(pkg-config
--variable=sourcesdbusservicename evolution-data-server-1.2)|\" \\",
- " -e \"s|\\@ADDRESSBOOK_SERVICE\\@|$(pkg-config
--variable=addressbookdbusservicename evolution-data-server-1.2)|\" \\",
- " -e \"s|\\@CALENDAR_SERVICE\\@|$(pkg-config
--variable=calendardbusservicename evolution-data-server-1.2)|\" \\",
- " -e \"s|\\@TIMEOUTMULT\\@|${TIMEOUTMULT}|\""
+ " -e \"s|\\@ADDRESSBOOK_SERVICE\\@|$(pkg-config
--variable=addressbookdbusservicename evolution-data-server-1.2)|\" \\",
+ " -e \"s|\\@CALENDAR_SERVICE\\@|$(pkg-config
--variable=calendardbusservicename evolution-data-server-1.2)|\" \\",
+ " -e \"s|\\@TIMEOUTMULT\\@|${TIMEOUTMULT}|\""
],
"dest-filename": "flatpak-evolution-fix-service-names.sh"
}
diff --git a/flatpak/org.gnome.Evolution-stable.json b/flatpak/org.gnome.Evolution-stable.json
index c8faab5128..6dd34df425 100644
--- a/flatpak/org.gnome.Evolution-stable.json
+++ b/flatpak/org.gnome.Evolution-stable.json
@@ -298,33 +298,33 @@
"type": "script",
"commands": [
"if [ \"$1\" = \"--quit\" -o \"$1\" = \"--force-shutdown\" ];
then",
- " /app/bin/evolution.bin \"$@\"",
+ " /app/bin/evolution.bin \"$@\"",
"else",
- " export
BOGOFILTER_DIR=\"${XDG_DATA_HOME}/bogofilter/\"",
- " export GIO_USE_NETWORK_MONITOR=base",
- " gsettings reset org.gnome.evolution-data-server
network-monitor-gio-name",
+ " export BOGOFILTER_DIR=\"${XDG_DATA_HOME}/bogofilter/\"",
+ " export GIO_USE_NETWORK_MONITOR=base",
+ " gsettings reset org.gnome.evolution-data-server
network-monitor-gio-name",
"",
- " gpg-agent --homedir ~/.gnupg --daemon
--pinentry-program=/app/bin/pinentry",
+ " gpg-agent --homedir ~/.gnupg --daemon
--pinentry-program=/app/bin/pinentry",
"",
- " LINES=$(gdbus call --session --dest
org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep
@SOURCES_SERVICE@ | wc -l)",
- " if [ \"${LINES}\" = \"0\" ]; then",
- " /app/libexec/evolution-source-registry &",
- " gdbus wait --session --timeout=1@TIMEOUTMULT@
@SOURCES_SERVICE@",
- " fi",
+ " LINES=$(gdbus call --session --dest org.freedesktop.DBus
--object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc
-l)",
+ " if [ \"${LINES}\" = \"0\" ]; then",
+ " /app/libexec/evolution-source-registry &",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@SOURCES_SERVICE@",
+ " fi",
"",
- " LINES=$(gdbus call --session --dest
org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep
@ADDRESSBOOK_SERVICE@ | wc -l)",
- " if [ \"${LINES}\" = \"0\" ]; then",
- " /app/libexec/evolution-addressbook-factory -r
&",
- " gdbus wait --session --timeout=1@TIMEOUTMULT@
@ADDRESSBOOK_SERVICE@",
- " fi",
+ " LINES=$(gdbus call --session --dest org.freedesktop.DBus
--object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @ADDRESSBOOK_SERVICE@ | wc
-l)",
+ " if [ \"${LINES}\" = \"0\" ]; then",
+ " /app/libexec/evolution-addressbook-factory -r &",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@ADDRESSBOOK_SERVICE@",
+ " fi",
"",
- " LINES=$(gdbus call --session --dest
org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep
@CALENDAR_SERVICE@ | wc -l)",
- " if [ \"${LINES}\" = \"0\" ]; then",
- " /app/libexec/evolution-calendar-factory -r &",
- " gdbus wait --session --timeout=1@TIMEOUTMULT@
@CALENDAR_SERVICE@",
- " fi",
+ " LINES=$(gdbus call --session --dest org.freedesktop.DBus
--object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @CALENDAR_SERVICE@ | wc
-l)",
+ " if [ \"${LINES}\" = \"0\" ]; then",
+ " /app/libexec/evolution-calendar-factory -r &",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@CALENDAR_SERVICE@",
+ " fi",
"",
- " /app/bin/evolution.bin \"$@\"",
+ " /app/bin/evolution.bin \"$@\"",
"fi"
],
"dest-filename": "flatpak-evolution-wrapper.sh.in"
@@ -337,9 +337,9 @@
"(`pkg-config --atleast-version 2.60.1 gio-2.0` ||
`pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000",
"",
"sed -e \"s|\\@SOURCES_SERVICE\\@|$(pkg-config
--variable=sourcesdbusservicename evolution-data-server-1.2)|\" \\",
- " -e \"s|\\@ADDRESSBOOK_SERVICE\\@|$(pkg-config
--variable=addressbookdbusservicename evolution-data-server-1.2)|\" \\",
- " -e \"s|\\@CALENDAR_SERVICE\\@|$(pkg-config
--variable=calendardbusservicename evolution-data-server-1.2)|\" \\",
- " -e \"s|\\@TIMEOUTMULT\\@|${TIMEOUTMULT}|\""
+ " -e \"s|\\@ADDRESSBOOK_SERVICE\\@|$(pkg-config
--variable=addressbookdbusservicename evolution-data-server-1.2)|\" \\",
+ " -e \"s|\\@CALENDAR_SERVICE\\@|$(pkg-config
--variable=calendardbusservicename evolution-data-server-1.2)|\" \\",
+ " -e \"s|\\@TIMEOUTMULT\\@|${TIMEOUTMULT}|\""
],
"dest-filename": "flatpak-evolution-fix-service-names.sh"
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
