From a6c82632a858f44875fb620f3b6736e2b6e0f29b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Wed, 9 Oct 2024 21:57:41 -0400
Subject: [PATCH] bring back scripts/

nix insists on mtime of 1970.
---
 flake.nix                | 28 ++--------------------------
 scripts/build-and-upload |  6 ++++++
 scripts/upload           |  5 +++++
 3 files changed, 13 insertions(+), 26 deletions(-)
 create mode 100755 scripts/build-and-upload
 create mode 100755 scripts/upload

diff --git a/flake.nix b/flake.nix
index f43c7dc..fed8a7b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,34 +16,10 @@
   }:
     flake-utils.lib.eachDefaultSystem (system: let
       pkgs = import nixpkgs {inherit system;};
-      devDeps = with pkgs; [hugo brotli zopfli parallel dart-sass];
-    in rec {
+    in {
       devShells.default = pkgs.mkShell {
         LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
-        packages = devDeps;
-      };
-
-      packages.default = pkgs.compressDrvWeb (pkgs.stdenv.mkDerivation {
-        pname = "jakstys.lt";
-        version = "1.0.0";
-        src = pkgs.lib.cleanSource self;
-        buildInputs = with pkgs; [hugo dart-sass];
-        buildPhase = "hugo --cleanDestinationDir --printPathWarnings --panicOnWarning";
-        installPhase = "mv public $out";
-      }) {};
-
-      apps.default = {
-        type = "app";
-        program = builtins.toString (pkgs.writeShellScript "upload" ''
-          ${pkgs.rsync}/bin/rsync \
-            --info=progress2 \
-            --copy-links \
-            --archive \
-            --partial \
-            --delete \
-            ${packages.default}/ \
-            jakstys.lt:/var/www/jakstys.lt/
-        '');
+        packages = with pkgs; [hugo brotli zopfli parallel dart-sass];
       };
 
       formatter = pkgs.alejandra;
diff --git a/scripts/build-and-upload b/scripts/build-and-upload
new file mode 100755
index 0000000..59c6849
--- /dev/null
+++ b/scripts/build-and-upload
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -xeuo pipefail
+cd "$(git rev-parse --show-toplevel)"
+
+scripts/build
+scripts/upload
diff --git a/scripts/upload b/scripts/upload
new file mode 100755
index 0000000..1549e35
--- /dev/null
+++ b/scripts/upload
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -xeuo pipefail
+cd "$(git rev-parse --show-toplevel)"
+
+rsync --info=progress2 -a --partial --delete public/ jakstys.lt:/var/www/jakstys.lt/