From d7f9e33e1c19ad3ef5035a7bad6d5ec53a6c997c Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Thu, 12 Aug 2021 15:29:19 +0200
Subject: [PATCH] joinmarket-ob-watcher: move resource files to extra dir

Don't clutter joinmarket/bin with ob-watcher resource files.
---
 modules/joinmarket-ob-watcher.nix |  2 +-
 pkgs/joinmarket/default.nix       | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/joinmarket-ob-watcher.nix b/modules/joinmarket-ob-watcher.nix
index 2f4fdc0..71ab397 100644
--- a/modules/joinmarket-ob-watcher.nix
+++ b/modules/joinmarket-ob-watcher.nix
@@ -77,7 +77,7 @@ in {
         StateDirectoryMode = "770";
         WorkingDirectory = cfg.dataDir; # The service creates dir 'logs' in the working dir
         ExecStart = ''
-          ${nbPkgs.joinmarket}/bin/ob-watcher --datadir=${cfg.dataDir} \
+          ${nbPkgs.joinmarket}/bin/jm-ob-watcher --datadir=${cfg.dataDir} \
             --host=${cfg.address} --port=${toString cfg.port}
         '';
         SystemCallFilter = nbLib.defaultHardening.SystemCallFilter ++ [ "mbind" ] ;
diff --git a/pkgs/joinmarket/default.nix b/pkgs/joinmarket/default.nix
index 7c3d71f..ddc1ab2 100644
--- a/pkgs/joinmarket/default.nix
+++ b/pkgs/joinmarket/default.nix
@@ -32,7 +32,6 @@ stdenv.mkDerivation {
     }
 
     cp scripts/joinmarketd.py $out/bin/joinmarketd
-    cp scripts/obwatch/ob-watcher.py $out/bin/ob-watcher
     cpBin add-utxo.py
     cpBin convert_old_wallet.py
     cpBin receive-payjoin.py
@@ -46,8 +45,13 @@ stdenv.mkDerivation {
     chmod +x -R $out/bin
     patchShebangs $out/bin
 
+    ## ob-watcher
+    obw=$out/libexec/joinmarket-ob-watcher
+    install -D scripts/obwatch/ob-watcher.py $obw/ob-watcher
+    patchShebangs $obw/ob-watcher
+    ln -s $obw/ob-watcher $out/bin/jm-ob-watcher
+
     # These files must be placed in the same dir as ob-watcher
-    cp scripts/obwatch/{orderbook.html,sybil_attack_calculations.py} $out/bin/
-    cp -r scripts/obwatch/vendor $out/bin/vendor
+    cp -r scripts/obwatch/{orderbook.html,sybil_attack_calculations.py,vendor} $obw
   '';
 }