summaryrefslogtreecommitdiff
path: root/tools/eos-application-manifest/eos-application-manifest.in
diff options
context:
space:
mode:
authorPhilip Chimento <philip@endlessm.com>2013-12-09 12:27:46 -0800
committerPhilip Chimento <philip@endlessm.com>2013-12-09 12:27:46 -0800
commitb60363fe96b449d4f929b851163ed59adbf10536 (patch)
tree218cc5f0b670b18178608c6096a9bdbbddf3595f /tools/eos-application-manifest/eos-application-manifest.in
parent740895d484a73e1791e7b4d4db1f14d27ae98a8a (diff)
Use System.exit() and System.programInvocationName
In GJS >= 1.38, these facilities are available. This removes the workarounds that we had for lack of these facilities. [endlessm/eos-sdk#432]
Diffstat (limited to 'tools/eos-application-manifest/eos-application-manifest.in')
-rw-r--r--tools/eos-application-manifest/eos-application-manifest.in11
1 files changed, 3 insertions, 8 deletions
diff --git a/tools/eos-application-manifest/eos-application-manifest.in b/tools/eos-application-manifest/eos-application-manifest.in
index 7edbcb1..f681c99 100644
--- a/tools/eos-application-manifest/eos-application-manifest.in
+++ b/tools/eos-application-manifest/eos-application-manifest.in
@@ -5,8 +5,6 @@ const Format = imports.format;
const System = imports.system;
String.prototype.format = Format.format;
-// monkeypatch System.programInvocationName which is not in this version of GJS
-System.programInvocationName = 'eos-application-manifest';
// Other constants, available from subcommands' code
const commandSearchPath = "@datadir@/eos-application-manifest/commands";
@@ -21,8 +19,7 @@ if (ARGV.length === 0) {
// automatically invoke "help" command with no arguments
const Help = imports.help;
Help.execute([]);
- // System.exit(1); broken, bugzilla.gnome.org #703826
- throw new Error();
+ System.exit(1);
}
let command_name = ARGV.shift();
@@ -34,14 +31,12 @@ try {
let program_name = System.programInvocationName;
printerr("%s: '%s' is not a valid command name. See %s help.".format(
program_name, command_name, program_name));
- // System.exit(1); broken
- throw new Error();
+ System.exit(1);
}
}
try {
command.execute(ARGV);
} catch (e) {
printerr('%s: %s'.format(System.programInvocationName, e.message));
- // System.exit(1); broken
- throw e;
+ System.exit(1);
}