From 323892f73860f254242a7000fb336015798deff7 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 2 Jun 2019 12:19:58 -0300 Subject: Parameterize the overwriting of docs publishing --- default.nix | 4 +++- utils.nix | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index fe8faae..dc9418a 100644 --- a/default.nix +++ b/default.nix @@ -35,5 +35,7 @@ in rec { (utils.fixme [ "default.nix" "utils.nix" ]) subtasks.uniqueFeeds ]; - publishScript = utils.overwritingPublishScript subtasks.docs; + publishScript = utils.overwritingPublishScript { + docsDerivation = subtasks.docs; + }; } diff --git a/utils.nix b/utils.nix index f877b09..f02db70 100644 --- a/utils.nix +++ b/utils.nix @@ -85,11 +85,11 @@ in rec { touch $out ''; }); - overwritingPublishScript = docsDerivation: + overwritingPublishScript = { docsDerivation, overwrite ? true }: pkgs.writeShellScriptBin "publish.sh" '' set -euo pipefail OUT_DOCS="${docsDerivation}" - ${pkgs.openssh}/bin/ssh -o StrictHostKeyChecking=no "$SERVER_URL" rm -rf "$DOCS_SERVER_PATH/*" + ${if overwrite then "# " else ""}${pkgs.openssh}/bin/ssh -o StrictHostKeyChecking=no "$SERVER_URL" rm -rf "$DOCS_SERVER_PATH/*" ${pkgs.rsync}/bin/rsync -avzP \ --rsh="ssh -o StrictHostKeyChecking=no" \ "$OUT_DOCS/" \ -- cgit v1.2.3