Skip to content

Commit cdca0da

Browse files
committed
Replace manifest files with their templates
1 parent aebf118 commit cdca0da

File tree

4 files changed

+21
-11
lines changed

4 files changed

+21
-11
lines changed

Makefile

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
11
Q_EXTENSION_DIR = $(realpath .)/extension
22
Q_EXTENSION_SRC_DIR = $(Q_EXTENSION_DIR)/src
33
Q_EXTENSION_DST_DIR = $(Q_EXTENSION_DIR)/dist
4+
Q_EXTENSION_MANIFEST_TMPL = $(Q_EXTENSION_DIR)/manifest.json.tmpl
5+
Q_EXTENSION_MANIFEST = $(Q_EXTENSION_SRC_DIR)/manifest.json
46
Q_EXTENSION_VERSION = 0.0.0
57

8+
$(Q_EXTENSION_MANIFEST): $(Q_EXTENSION_MANIFEST_TMPL)
9+
export Q_EXTENSION_VERSION=$(Q_EXTENSION_VERSION) \
10+
&& cat $(Q_EXTENSION_MANIFEST_TMPL) \
11+
| envsubst > $(Q_EXTENSION_MANIFEST) \
12+
&& cat $(Q_EXTENSION_MANIFEST)
13+
614
Q_HOST_DIR = $(realpath .)/host
715
Q_HOST_BIN_DIR = $(Q_HOST_DIR)/bin
816

917
$(Q_HOST_BIN_DIR):
1018
mkdir -p $@
1119

1220
Q_HOST = $(Q_HOST_BIN_DIR)/q
13-
Q_HOST_MANIFEST = $(Q_HOST_DIR)/manifest.json
21+
Q_HOST_MANIFEST_TMPL = $(Q_HOST_DIR)/manifest.json.tmpl
1422

1523
# See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_manifests#manifest_location
16-
Q_HOST_MANIFEST_INSTALL_DIR = $(HOME)/.mozilla/native-messaging-hosts
24+
Q_HOST_MANIFEST_DIR = $(HOME)/.mozilla/native-messaging-hosts
1725
ifeq ($(shell uname -s), Darwin)
18-
Q_HOST_MANIFEST_INSTALL_DIR = $(HOME)/Library/Application\ Support/Mozilla/NativeMessagingHosts
26+
Q_HOST_MANIFEST_DIR = $(HOME)/Library/Application\ Support/Mozilla/NativeMessagingHosts
1927
endif
2028

21-
Q_HOST_MANIFEST_INSTALL_PATH = $(Q_HOST_MANIFEST_INSTALL_DIR)/dev.sulim.q.json
29+
Q_HOST_MANIFEST = $(Q_HOST_MANIFEST_DIR)/dev.sulim.q.json
2230

2331
$(Q_HOST): $(Q_HOST_DIR)/*.go | $(Q_HOST_BIN_DIR)
2432
cd $(Q_HOST_DIR) \
@@ -44,14 +52,14 @@ host-check:
4452
host-build: host-check $(Q_HOST)
4553

4654
.PHONY: host-install
47-
host-install: host-build $(Q_HOST_MANIFEST)
55+
host-install: host-build $(Q_HOST_MANIFEST_TMPL)
4856
export Q_HOST_PATH=$(abspath $(Q_HOST)) \
49-
&& cat $(Q_HOST_MANIFEST) \
50-
| envsubst > $(Q_HOST_MANIFEST_INSTALL_PATH) \
51-
&& cat $(Q_HOST_MANIFEST_INSTALL_PATH)
57+
&& cat $(Q_HOST_MANIFEST_TMPL) \
58+
| envsubst > $(Q_HOST_MANIFEST) \
59+
&& cat $(Q_HOST_MANIFEST)
5260

5361
.PHONY: extension-check
54-
extension-check:
62+
extension-check: $(Q_EXTENSION_MANIFEST)
5563
$(WEB_EXT) lint --source-dir=$(Q_EXTENSION_SRC_DIR) \
5664
--self-hosted
5765

@@ -90,4 +98,5 @@ install: host-install extension-install
9098
.PHONY: clean
9199
clean:
92100
rm -rf $(Q_HOST_BIN_DIR) \
93-
$(Q_EXTENSION_DST_DIR)
101+
$(Q_EXTENSION_DST_DIR) \
102+
$(Q_EXTENSION_MANIFEST)

extension/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/dist
22
/node_modules
3+
/src/manifest.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifest_version": 2,
33
"name": "Q: process pages with your scripts",
44
"short_name": "Q",
5-
"version": "0.2.0",
5+
"version": "${Q_EXTENSION_VERSION}",
66
"description": "Q allows you to send web pages to your external scripts for further processing.",
77
"author": "Alexander Sulim",
88
"homepage_url": "https://github.com/soulim/q/",

0 commit comments

Comments
 (0)