Use import_files feature of new debcrafter

Previously imported files had to specified twice - in `build_rules` and in `sps` files. This uses the new debcrafter feature to avoid it and prepares for heavier CI caching.
debian-cryptoanarchy · Jan 3, 2024 · 768cd73 · 768cd73
1 parent abb4eb7
commit 768cd73
Show file tree

Hide file tree

Showing 30 changed files with 70 additions and 171 deletions.
diff --git a/build_rules/bitcoin-whitepaper.yaml b/build_rules/bitcoin-whitepaper.yaml
@@ -2,9 +2,3 @@ pkg_name_upper: BITCOIN_WHITEPAPER
 pkg_name_snake: bitcoin_whitepaper
 source_name: bitcoin-whitepaper
 build_system: none
-
-copy_assets:
-        - from: bitcoin-whitepaper/bitcoin.pdf
-          to: bitcoin.pdf
-        - from: bitcoin-whitepaper/publish-bitcoin-whitepaper.conf
-          to: publish-bitcoin-whitepaper.conf
diff --git a/build_rules/bitcoin.yaml b/build_rules/bitcoin.yaml
@@ -14,14 +14,3 @@ shasums:
         url:  https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION)/SHA256SUMS.asc
 
 build_system: none
-copy_assets:
-        - from: bitcoin/xbitcoin-cli
-          to: xbitcoin-cli
-        - from: bitcoin/check_needs_reindex.sh
-          to: check_needs_reindex.sh
-        - from: bitcoin/bitcoind
-          to: bitcoind
-        - from: bitcoin/definitions.sh
-          to: definitions.sh
-        - from: bitcoin/notify_startup.sh
-          to: notify_startup.sh
diff --git a/build_rules/btc-rpc-explorer.yaml b/build_rules/btc-rpc-explorer.yaml
@@ -10,17 +10,3 @@ verify_commit: true
 build_system: npm
 npm_exclude_files: btc-rpc-explorer
 npm_bin_package_name: btc-rpc-explorer
-
-copy_assets:
-        - from: btc-rpc-explorer/btc-rpc-explorer
-          to: btc-rpc-explorer
-        - from: btc-rpc-explorer/selfhost-dashboard/entry_points/open
-          to: selfhost-dashboard/entry_points/open
-        - from: btc-rpc-explorer/logo-mainnet.png
-          to: public/img/logo/logo-mainnet.png
-        - from: btc-rpc-explorer/logo-regtest.png
-          to: public/img/logo/logo-regtest.png
-
-dirs:
-        - dir: selfhost-dashboard
-        - dir: selfhost-dashboard/entry_points
diff --git a/build_rules/electrum.yaml b/build_rules/electrum.yaml
@@ -9,11 +9,3 @@ get_assets:
         - url: https://download.electrum.org/$(ELECTRUM_VERSION)/electrum-$(ELECTRUM_VERSION)-$(ARCH).AppImage
           file_name: electrum
           signature: https://download.electrum.org/$(ELECTRUM_VERSION)/electrum-$(ELECTRUM_VERSION)-$(ARCH).AppImage.asc
-
-copy_assets:
-        - from: electrum/assets/electrum-trustless-launcher
-          to: electrum-trustless-launcher
-        - from: electrum/assets/electrum-trustless-mainnet.desktop
-          to: electrum-trustless-mainnet.desktop
-        - from: electrum/assets/electrum-trustless-regtest.desktop
-          to: electrum-trustless-regtest.desktop
diff --git a/build_rules/lnd.yaml b/build_rules/lnd.yaml
@@ -16,25 +16,3 @@ shasums:
         detached_sig: https://github.com/lightningnetwork/lnd/releases/download/v$(LND_VERSION)-beta/manifest-guggero-v$(LND_VERSION)-beta.sig
 
 build_system: none
-
-copy_assets:
-        - from: lnd/xlncli
-          to: xlncli
-        - from: lnd/auto_unlock.sh
-          to: auto_unlock/auto_unlock.sh
-        - from: lnd/auto_unlock_set.sh
-          to: auto_unlock/set.sh
-        - from: lnd/auto_unlock_common.sh
-          to: auto_unlock/common.sh
-        - from: lnd/static_password
-          to: auto_unlock/static_password
-        - from: lnd/gen_macaroons.sh
-          to: gen_macaroons.sh
-        - from: lnd/bash_lib.sh
-          to: lib/bash.sh
-        - from: lnd/get_external_addr.sh
-          to: get_external_addr.sh
-
-dirs:
-        - dir: lib
-        - dir: auto_unlock
diff --git a/build_rules/lndconnect.yaml b/build_rules/lndconnect.yaml
@@ -2,9 +2,3 @@ pkg_name_upper: LNDCONNECT
 pkg_name_snake: lndconnect
 source_name: lndconnect
 build_system: none
-
-copy_assets:
-        - from: lndconnect/lndconnect
-          to: lndconnect
-        - from: lndconnect/onion.sh
-          to: onion.sh
diff --git a/build_rules/ridetheln.yaml b/build_rules/ridetheln.yaml
@@ -10,19 +10,5 @@ build_system: npm
 npm_exclude_files: ridetheln
 npm_bin_package_name: ridetheln
 
-copy_assets:
-        - from: ridetheln/alloc_index.sh
-          to: alloc_index.sh
-        - from: ridetheln/update_config.sh
-          to: update_config.sh
-        - from: ridetheln/assets/ridetheln
-          to: ridetheln
-        - from: ridetheln/selfhost-dashboard/entry_points/open
-          to: selfhost-dashboard/entry_points/open
-
 remove:
         path: "product management"
-
-dirs:
-        - dir: selfhost-dashboard
-        - dir: selfhost-dashboard/entry_points
diff --git a/build_rules/selfhost.yaml b/build_rules/selfhost.yaml
@@ -2,31 +2,3 @@ pkg_name_upper: SELFHOST
 pkg_name_snake: selfhost
 source_name: selfhost
 build_system: none
-
-copy_assets:
-        - from: selfhost/nginx/generate_config.sh
-          to: nginx/generate_config.sh
-        - from: selfhost/nginx/config_sub_template.mustache
-          to: nginx/config_sub_template.mustache
-        - from: selfhost/nginx/config_top_template.mustache
-          to: nginx/config_top_template.mustache
-        - from: selfhost/certbot/reload_nginx.sh
-          to: certbot/reload_nginx.sh
-        - from: selfhost/certbot/generate_certs.sh
-          to: certbot/generate_certs.sh
-        - from: selfhost/certbot/selfhost-clearnet-certbot-webroot.conf
-          to: certbot/selfhost-clearnet-certbot-webroot.conf
-        - from: selfhost/onion/onion_domain.sh
-          to: onion/onion_domain.sh
-        - from: selfhost/onion/hidden_service.conf
-          to: onion/hidden_service.conf
-        - from: selfhost/lib/get_default_domain.sh
-          to: lib/get_default_domain.sh
-        - from: selfhost/onion/advertise_onion.sh
-          to: onion/advertise_onion.sh
-
-dirs:
-        - dir: nginx
-        - dir: certbot
-        - dir: onion
-        - dir: lib
diff --git a/build_rules/thunderhub.yaml b/build_rules/thunderhub.yaml
@@ -18,18 +18,3 @@ build_system: npm
 npm_exclude_files: thunderhub
 npm_include_files: .next
 npm_bin_package_name: thunderhub
-
-copy_assets:
-        - from: thunderhub/thunderhub
-          to: thunderhub
-        - from: thunderhub/open-browser.sh
-          to: thunderhub-open
-        - from: thunderhub/selfhost-dashboard/entry_points/open
-          to: selfhost-dashboard/entry_points/open
-        - from: thunderhub/selfhost-dashboard/icons/entry_main.png
-          to: selfhost-dashboard/icons/entry_main.png
-
-dirs:
-        - dir: selfhost-dashboard
-        - dir: selfhost-dashboard/entry_points
-        - dir: selfhost-dashboard/icons
diff --git a/build_rules/tor-extras.yaml b/build_rules/tor-extras.yaml
@@ -2,9 +2,3 @@ pkg_name_upper: TOR_EXTRAS
 pkg_name_snake: tor_extras
 source_name: tor-extras
 build_system: none
-
-copy_assets:
-        - from: tor-extras/assets/defaults.patch
-          to: defaults.patch
-        - from: tor-extras/assets/apparmor.patch
-          to: apparmor.patch
diff --git a/common_rules.mk b/common_rules.mk
@@ -21,7 +21,7 @@ $(BUILD_DIR):
 	mkdir -p $@
 
 $(BUILD_DIR)/debcrafter-%.stamp: pkg_specs/%.sss pkg_specs/%.changelog $(BUILD_DIR)/%.d $(BUILD_DIR)/verify-%.stamp $(shell which debcrafter)
-	DEBEMAIL=$(MAINTAINER) debcrafter $< $(BUILD_DIR) --split-source --write-deps $(BUILD_DIR)/$*.d
+	DEBEMAIL=$(MAINTAINER) debcrafter $< $(BUILD_DIR) --write-deps $(BUILD_DIR)/$*.d
 	touch $@
 
 $(BUILD_DIR)/packages-%.stamp: $(BUILD_DIR)/debcrafter-%.stamp

diff --git a/debcrafter-version b/debcrafter-version
@@ -1 +1 @@
-b42f2fad79f23a03108ac69ae3e0e6987f64a60f
+7bc4a47591b0d3a6daa564abd38643125e5724cc
diff --git a/pkg_specs/bitcoin-cli.sps b/pkg_specs/bitcoin-cli.sps
@@ -2,7 +2,8 @@ name = "bitcoin-cli"
 architecture = "any"
 summary = "Bitcoin CLI"
 suggests = ["bitcoin-mainnet | bitcoin-regtest"]
-add_files = ["bin/bitcoin-cli /usr/lib/bitcoin-cli", "xbitcoin-cli /usr/share/bitcoin-cli"]
+add_files = ["bin/bitcoin-cli /usr/lib/bitcoin-cli"]
+import_files = [["../bitcoin/xbitcoin-cli", "/usr/share/bitcoin-cli/xbitcoin-cli"]]
 add_manpages = ["share/man/man1/bitcoin-cli.1"]
 long_doc = """bitcoin-cli is a tool used for managing bitcoind from the command line. This package
 also contains a wrapper used to connect to the system-wide bitcoind by default.

diff --git a/pkg_specs/bitcoind.sps b/pkg_specs/bitcoind.sps
@@ -9,10 +9,12 @@ add_files = [
 	"lib/libbitcoinconsensus.so /usr/lib",
 	"lib/libbitcoinconsensus.so.0 /usr/lib",
 	"lib/libbitcoinconsensus.so.0.0.0 /usr/lib",
-	"definitions.sh /usr/share/bitcoind",
-	"check_needs_reindex.sh /usr/share/bitcoind",
-	"bitcoind /usr/share/bitcoind",
-	"notify_startup.sh /usr/share/bitcoind"
+]
+import_files = [
+	["../bitcoin/definitions.sh", "/usr/share/bitcoind/definitions.sh"],
+	["../bitcoin/check_needs_reindex.sh", "/usr/share/bitcoind/check_needs_reindex.sh"],
+	["../bitcoin/bitcoind", "/usr/share/bitcoind/bitcoind"],
+	["../bitcoin/notify_startup.sh", "/usr/share/bitcoind/notify_startup.sh"]
 ]
 add_manpages = ["share/man/man1/bitcoind.1"]
 long_doc = """Bitcoin Core is the original Bitcoin client and it builds the backbone

diff --git a/pkg_specs/btc-rpc-explorer.sps b/pkg_specs/btc-rpc-explorer.sps
@@ -3,7 +3,13 @@ architecture = "any"
 summary = "Simple, database-free Bitcoin blockchain explorer"
 depends = ["nodejs (>= 8.0.0)"]
 recommends = ["bitcoin-mainnet | bitcoin-regtest, btc-rpc-explorer-mainnet | bitcoin-regtest, btc-rpc-explorer-regtest | bitcoin-mainnet, btc-rpc-explorer-both | btc-rpc-explorer-mainnet | btc-rpc-explorer-regtest"]
-add_files = ["/usr/lib/btc-rpc-explorer", "btc-rpc-explorer /usr/bin/", "selfhost-dashboard /usr/share/btc-rpc-explorer"]
+add_files = ["/usr/lib/btc-rpc-explorer"]
+import_files = [
+	["../btc-rpc-explorer/btc-rpc-explorer", "/usr/bin/btc-rpc-explorer"],
+	["../btc-rpc-explorer/selfhost-dashboard/entry_points/open", "/usr/share/btc-rpc-explorer/selfhost-dashboard/entry_points/open"],
+	["../btc-rpc-explorer/logo-mainnet.png", "/usr/share/btc-rpc-explorer/selfhost-dashboard/logo-mainnet.png"],
+	["../btc-rpc-explorer/logo-regtest.png", "/usr/share/btc-rpc-explorer/selfhost-dashboard/logo-regtest.png"],
+]
 long_doc = """This is a simple, self-hosted explorer for the Bitcoin blockchain, driven by RPC calls to your own Bitcoin node. It is easy to run and can be connected to other tools (like ElectrumX) to achieve a full-featured explorer.
 
 Whatever reasons one may have for running a full node (trustlessness, technical curiosity, supporting the network, etc) it's helpful to appreciate the "fullness" of your node. With this explorer, you can explore not just the blockchain database, but also explore the functional capabilities of your own node."""
diff --git a/pkg_specs/[email protected] b/pkg_specs/[email protected]
@@ -2,7 +2,7 @@ name = "electrum-trustless-@variant"
 architecture = "all"
 summary = "Electrum - Lightweight Bitcoin client (secure launcher)"
 depends = ["electrum (>= 4.4.6)"]
-add_files = ["electrum-trustless-{variant}.desktop /usr/share/applications/"]
+import_files = [["../electrum/assets/electrum-trustless-{variant}.desktop", "/usr/share/applications/electrum-trustless-{variant}.desktop"]]
 add_links = ["/usr/share/electrum/electrum-trustless-launcher /usr/bin/electrum-trustless-{variant}"]
 long_doc = """Electrum is a powerful Bitcoin wallet capable of using hardware wallets.
 

diff --git a/pkg_specs/electrum.sps b/pkg_specs/electrum.sps
@@ -2,5 +2,6 @@ name = "electrum"
 architecture = "any"
 summary = "Electrum - Lightweight Bitcoin client (exeutable)"
 recommends = ["electrum-trustless-mainnet | electrum-trustless-regtest", "python3-pyqt5"]
-add_files = ["electrum /usr/bin", "electrum-trustless-launcher /usr/share/electrum"]
+add_files = ["electrum /usr/bin"]
+import_files = [["../electrum/assets/electrum-trustless-launcher", "/usr/share/electrum/electrum-trustless-launcher"]]
 long_doc = """Electrum is a powerful Bitcoin wallet capable of using hardware wallets."""
diff --git a/pkg_specs/lncli.sps b/pkg_specs/lncli.sps
@@ -2,7 +2,8 @@ name = "lncli"
 architecture = "any"
 summary = "Lightnning Network Daemon CLI"
 suggests = ["lnd-system-mainnet | lnd-system-regtest"]
-add_files = ["lncli /usr/lib/lncli", "xlncli /usr/share/lncli"]
+add_files = ["lncli /usr/lib/lncli"]
+import_files = [["../lnd/xlncli", "/usr/share/lncli/xlncli"]]
 long_doc = """lncli is a tool used for managing lnd from the command line. This package
 also contains a wrapper used to connect to the system-wide LND by default.
 You can still use --macaroonpath --rpcserver and --tlscertpath to access a

diff --git a/pkg_specs/lnd-auto-unlock.sps b/pkg_specs/lnd-auto-unlock.sps
@@ -2,4 +2,9 @@ name = "lnd-auto-unlock"
 architecture = "all"
 summary = "Auto init/unlock script for LND"
 depends = ["bash", "wget", "jq"]
-add_files = ["auto_unlock/auto_unlock.sh /usr/share/lnd-auto-unlock", "auto_unlock/common.sh /usr/share/lnd-auto-unlock", "auto_unlock/set.sh /usr/share/lnd-auto-unlock", "auto_unlock/static_password /usr/share/lnd-auto-unlock"]
+import_files = [
+	["../lnd/auto_unlock.sh", "/usr/share/lnd-auto-unlock/auto_unlock.sh"],
+	["../lnd/auto_unlock_common.sh", "/usr/share/lnd-auto-unlock/common.sh"],
+	["../lnd/auto_unlock_set.sh", "/usr/share/lnd-auto-unlock/set.sh"],
+	["../lnd/static_password", "/usr/share/lnd-auto-unlock/static_password"]
+]
diff --git a/pkg_specs/lnd-genmacaroon.sps b/pkg_specs/lnd-genmacaroon.sps
@@ -2,4 +2,4 @@ name = "lnd-genmacaroon"
 architecture = "all"
 summary = "Creates additional LND macaroons"
 depends = ["lncli", "bash", "wget", "jq"]
-add_files = ["gen_macaroons.sh /usr/share/lnd"]
+import_files = [["../lnd/gen_macaroons.sh", "/usr/share/lnd/gen_macaroons.sh"]]
diff --git a/pkg_specs/lnd.sps b/pkg_specs/lnd.sps
@@ -3,7 +3,11 @@ architecture = "any"
 summary = "Lightnning Network Daemon"
 recommends = ["bitcoin-mainnet | bitcoin-regtest, lnd-system-mainnet | bitcoin-regtest, lnd-system-regtest | bitcoin-mainnet, lnd-system-both | lnd-system-mainnet | lnd-system-regtest"]
 suggests = ["lncli"]
-add_files = ["lnd /usr/bin", "lib/bash.sh /usr/share/lnd/lib", "get_external_addr.sh /usr/share/lnd"]
+add_files = ["lnd /usr/bin"]
+import_files = [
+	["../lnd/bash_lib.sh", "/usr/share/lnd/lib/bash.sh"],
+	["../lnd/get_external_addr.sh", "/usr/share/lnd/get_external_addr.sh"]
+]
 long_doc = """The Lightning Network Daemon (lnd) - is a complete implementation of a
 Lightning Network node. lnd has several pluggable back-end chain services
 including btcd (a full-node), bitcoind, and neutrino (a new experimental light

diff --git a/pkg_specs/lndconnect.sps b/pkg_specs/lndconnect.sps
@@ -2,7 +2,10 @@ name = "lndconnect"
 architecture = "all"
 summary = "A CLI helper to create lndconnect string"
 depends = ["lnd-system-mainnet | lnd-system-regtest", "tor-hs-patch-config"]
-add_files = ["lndconnect /usr/bin", "onion.sh /usr/share/lndconnect"]
+import_files = [
+	["../lndconnect/lndconnect", "/usr/bin/lndconnect"],
+	["../lndconnect/onion.sh", "/usr/share/lndconnect/onion.sh"]
+]
 long_doc = """lndconnect is a tool to create a string that can be used by e.g. Zap wallet
 to connect to lnd. Warning: this tool is not meant to stay the same for a long time, don't rely on its API!"""
 

diff --git a/pkg_specs/publish-bitcoin-whitepaper.sps b/pkg_specs/publish-bitcoin-whitepaper.sps
@@ -3,9 +3,9 @@ extends = "selfhost"
 depends_on_extended = true
 replaces = false
 summary = "Publishes bitcoin whitepaper as /bitcoin.pdf"
-add_files = [
-	"bitcoin.pdf /usr/share/publish-bitcoin-whitepaper",
-	"publish-bitcoin-whitepaper.conf /usr/share/publish-bitcoin-whitepaper",
+import_files = [
+	["../bitcoin-whitepaper/bitcoin.pdf", "/usr/share/publish-bitcoin-whitepaper/bitcoin.pdf"],
+	["../bitcoin-whitepaper/publish-bitcoin-whitepaper.conf", "/usr/share/publish-bitcoin-whitepaper/publish-bitcoin-whitepaper.conf"],
 ]
 add_links = ["/usr/share/publish-bitcoin-whitepaper/publish-bitcoin-whitepaper.conf /etc/nginx/selfhost-subsites-enabled/publish-bitcoin-whitepaper.conf"]
 

diff --git a/pkg_specs/ridetheln.sps b/pkg_specs/ridetheln.sps
@@ -3,12 +3,12 @@ architecture = "all"
 summary = "A full function web browser app for LND and C-Lightning."
 depends = ["nodejs (>= 8.0.0)"]
 recommends = ["ridetheln-system"]
-add_files = [
-	"/usr/lib/ridetheln",
-	"ridetheln /usr/bin/",
-	"update_config.sh /usr/share/ridetheln",
-	"alloc_index.sh /usr/share/ridetheln",
-	"selfhost-dashboard /usr/share/ridetheln"
+add_files = ["/usr/lib/ridetheln"]
+import_files = [
+	["../ridetheln/assets/ridetheln", "/usr/bin/ridetheln"],
+	["../ridetheln/update_config.sh", "/usr/share/ridetheln/update_config.sh"],
+	["../ridetheln/alloc_index.sh", "/usr/share/ridetheln/alloc_index.sh"],
+	["../ridetheln/selfhost-dashboard/entry_points/open", "/usr/share/ridetheln/selfhost-dashboard/entry_points/open"]
 ]
 long_doc = """RTL is a full function, device agnostic, web user interface to help manage
 lightning node operations. RTL is available on LND and C-Lightning

diff --git a/pkg_specs/selfhost-clearnet-certbot.sps b/pkg_specs/selfhost-clearnet-certbot.sps
@@ -4,10 +4,10 @@ replaces = false
 depends = ["certbot", "python3-certbot-nginx", "bash"]
 provides = ["default-selfhost-tls (= 1.0)", "selfhost-tls (= 1.0)"]
 summary = "Integration of certbot into selfhost/nginx"
-add_files = [
-	"certbot/generate_certs.sh /usr/share/selfhost-clearnet-certbot",
-	"certbot/selfhost-clearnet-certbot-webroot.conf /usr/share/selfhost-clearnet-certbot",
-	"certbot/reload_nginx.sh /etc/letsencrypt/renewal-hooks/deploy",
+import_files = [
+	["../selfhost/certbot/generate_certs.sh", "/usr/share/selfhost-clearnet-certbot/generate_certs.sh"],
+	["../selfhost/certbot/selfhost-clearnet-certbot-webroot.conf", "/usr/share/selfhost-clearnet-certbot/selfhost-clearnet-certbot-webroot.conf"],
+	["../selfhost/certbot/reload_nginx.sh", "/etc/letsencrypt/renewal-hooks/deploy/reload_nginx.sh"]
 ]
 add_links = ["/usr/share/selfhost-clearnet-certbot/selfhost-clearnet-certbot-webroot.conf /etc/nginx/selfhost-subsites-enabled/selfhost-clearnet-certbot-webroot.conf"]
 extra_triggers = ["/usr/sbin/nginx", "/usr/bin/certbot", "/usr/lib/x86_64-linux-gnu/libssl.so.1.1", "/usr/lib/python3/dist-packages/certbot_nginx"]

diff --git a/pkg_specs/selfhost-nginx.sps b/pkg_specs/selfhost-nginx.sps
@@ -3,8 +3,8 @@ architecture = "all"
 summary = "Tooling for hosting web applications using nginx"
 depends = ["nginx", "ruby-mustache", "bash", "python3"]
 conflicts = ["selfhost-domain (<< 1.1)"]
-add_files = [
-	"nginx/config_top_template.mustache /usr/share/selfhost-nginx",
-	"nginx/config_sub_template.mustache /usr/share/selfhost-nginx",
-	"nginx/generate_config.sh /usr/share/selfhost-nginx",
+import_files = [
+	["../selfhost/nginx/config_top_template.mustache", "/usr/share/selfhost-nginx/config_top_template.mustache"],
+	["../selfhost/nginx/config_sub_template.mustache", "/usr/share/selfhost-nginx/config_sub_template.mustache"],
+	["../selfhost/nginx/generate_config.sh", "/usr/share/selfhost-nginx/generate_config.sh"],
 ]
diff --git a/pkg_specs/selfhost-onion.sps b/pkg_specs/selfhost-onion.sps
@@ -4,10 +4,10 @@ extends = "selfhost"
 depends = ["tor-hs-patch-config", "bash"]
 provides = ["default-selfhost-domain (= 1.1)", "selfhost-domain (= 1.1)"]
 
-add_files = [
-	"onion/onion_domain.sh /usr/share/selfhost-onion",
-	"onion/hidden_service.conf /usr/share/selfhost-onion",
-	"onion/advertise_onion.sh /usr/share/selfhost-onion",
+import_files = [
+	["../selfhost/onion/onion_domain.sh", "/usr/share/selfhost-onion/onion_domain.sh"],
+	["../selfhost/onion/hidden_service.conf", "/usr/share/selfhost-onion/hidden_service.conf"],
+	["../selfhost/onion/advertise_onion.sh", "/usr/share/selfhost-onion/advertise_onion.sh"],
 ]
 
 [config."domains/onion.conf"]

diff --git a/pkg_specs/selfhost.sps b/pkg_specs/selfhost.sps
@@ -4,7 +4,7 @@ summary = "Tooling for hosting web applications"
 # The gateway implementation is separated out, but rigid now.
 # We want to decouple it completely at some point, but that's not a priority right now.
 depends = ["selfhost-nginx (>= 0.1.4)", "selfhost-nginx (<< 0.2.0)", "default-selfhost-domain (>= 1.0) | selfhost-domain (>= 1.0)", "default-selfhost-domain (<< 2.0) | selfhost-domain (<< 2.0)"]
-add_files = ["lib/get_default_domain.sh usr/share/selfhost/lib/"]
+import_files = [["../selfhost/lib/get_default_domain.sh", "/usr/share/selfhost/lib/get_default_domain.sh"]]
 
 [config."domains.conf"]
 format = "yaml"

diff --git a/pkg_specs/thunderhub.sps b/pkg_specs/thunderhub.sps
@@ -6,5 +6,11 @@ depends = ["nodejs (>= 8.0.0)"]
 recommends = ["bitcoin-mainnet | bitcoin-regtest, thunderhub-system-mainnet | bitcoin-regtest, thunderhub-system-regtest | bitcoin-mainnet, thunderhub-system-both | thunderhub-system-mainnet | thunderhub-system-regtest"]
 # Interestingly, this is not needed because *our* interface consists of scripts that are in the main package and those where (had to be) updated.
 #conflicts = ["thunderhub-system-mainnet (<< 0.11.0)", "thunderhub-system-regtest (<< 0.11.0)"]
-add_files = ["/usr/lib/thunderhub", "thunderhub /usr/bin/", "thunderhub-open /usr/bin/", "selfhost-dashboard /usr/share/thunderhub"]
+add_files = ["/usr/lib/thunderhub"]
+import_files = [
+	["../thunderhub/thunderhub", "/usr/bin/thunderhub"],
+	["../thunderhub/open-browser.sh", "/usr/bin/thunderhub-open"],
+	["../thunderhub/selfhost-dashboard/entry_points/open", "/usr/share/thunderhub/selfhost-dashboard/entry_points/open"],
+	["../thunderhub/selfhost-dashboard/icons/entry_main.png", "/usr/share/thunderhub/selfhost-dashboard/icons/entry_main.png"]
+]
 long_doc = """ThunderHub is an open-source LND node manager where you can manage and monitor your node on any device or browser. It allows you to take control of the lightning network with a simple and intuitive UX and the most up-to-date tech stack."""