diff --git a/bin/com.github.rafostar.Clapper.Subprocess.in b/bin/com.github.rafostar.Clapper.Subprocess.in deleted file mode 100644 index b4621a03..00000000 --- a/bin/com.github.rafostar.Clapper.Subprocess.in +++ /dev/null @@ -1,17 +0,0 @@ -#!@GJS@ - -/* pkg init enforces the imports path to the folder - * named after the pkg name, but I would prefer to have - * the bundled subprocess stored in the same directory */ -imports.searchPath.unshift('@datadir@/@PACKAGE_NAME@'); - -const Package = imports.package; - -Package.init({ - name: '@PACKAGE_NAME@.@ID_POSTFIX@', - version: '@PACKAGE_VERSION@', - prefix: '@prefix@', - libdir: '@libdir@', - datadir: '@datadir@', -}); -Package.run(imports.src.main@ID_POSTFIX@); diff --git a/bin/com.github.rafostar.Clapper.in b/bin/com.github.rafostar.Clapper.in index 22533e35..4b54cfa8 100644 --- a/bin/com.github.rafostar.Clapper.in +++ b/bin/com.github.rafostar.Clapper.in @@ -1,12 +1,10 @@ #!@GJS@ -const Package = imports.package; - -Package.init({ +imports.package.init({ name: '@PACKAGE_NAME@', version: '@PACKAGE_VERSION@', prefix: '@prefix@', libdir: '@libdir@', datadir: '@datadir@', }); -Package.run(imports.src.main); +imports.package.run(imports.src.main@ID_POSTFIX@); diff --git a/bin/meson.build b/bin/meson.build index 468aa626..4e1bc8fa 100644 --- a/bin/meson.build +++ b/bin/meson.build @@ -2,7 +2,6 @@ clapper_apps = ['', 'Remote', 'Daemon'] foreach id_postfix : clapper_apps app_postfix = (id_postfix != '') ? '.' + id_postfix : '' - template_type = (id_postfix != '') ? '.Subprocess' : '' bin_conf = configuration_data() bin_conf.set('GJS', find_program('gjs').path()) @@ -14,7 +13,7 @@ foreach id_postfix : clapper_apps bin_conf.set('datadir', join_paths(get_option('prefix'), get_option('datadir'))) configure_file( - input: 'com.github.rafostar.Clapper' + template_type + '.in', + input: 'com.github.rafostar.Clapper.in', output: 'com.github.rafostar.Clapper' + app_postfix, configuration: bin_conf, install: true,