From 78a344ac86fff655c9aee1e210da9a25d54effc4 Mon Sep 17 00:00:00 2001 From: tdro Date: Tue, 26 Mar 2024 20:56:38 -0400 Subject: Makefile: Update icons XML canonicalization --- Makefile | 77 +++++++++++++++--------------- shell.nix | 1 + static/icons/feather/alert-circle.svg | 12 ++--- static/icons/feather/arrow-down-circle.svg | 10 ++-- static/icons/feather/arrow-left.svg | 10 ++-- static/icons/feather/arrow-right.svg | 10 ++-- static/icons/feather/arrow-up.svg | 10 ++-- static/icons/feather/at-sign.svg | 8 ++-- static/icons/feather/bookmark.svg | 8 ++-- static/icons/feather/calendar.svg | 20 ++++---- static/icons/feather/clock.svg | 8 ++-- static/icons/feather/edit.svg | 8 ++-- static/icons/feather/external-link.svg | 10 ++-- static/icons/feather/eye-off.svg | 10 ++-- static/icons/feather/eye.svg | 8 ++-- static/icons/feather/file-text.svg | 12 ++--- static/icons/feather/globe.svg | 10 ++-- static/icons/feather/link.svg | 8 ++-- static/icons/feather/map-pin.svg | 8 ++-- static/icons/feather/refresh-cw.svg | 8 ++-- static/icons/feather/search.svg | 10 ++-- static/icons/feather/trash-2.svg | 12 ++--- static/icons/feather/user.svg | 18 ------- static/icons/tabler/LICENSE | 2 +- static/icons/tabler/archive.svg | 14 ++---- static/icons/tabler/book-2.svg | 14 ++---- static/icons/tabler/circle.svg | 14 ++---- static/icons/tabler/clock.svg | 14 ++---- static/icons/tabler/code.svg | 14 ++---- static/icons/tabler/git-fork.svg | 14 ++---- static/icons/tabler/home.svg | 14 ++---- static/icons/tabler/notes.svg | 14 ++---- static/icons/tabler/pinned.svg | 14 ++---- static/icons/tabler/robot.svg | 14 ++---- static/icons/tabler/rss.svg | 14 ++---- static/icons/tabler/settings.svg | 14 ++---- static/icons/tabler/square-letter-m.svg | 14 ++---- static/icons/tabler/tag.svg | 14 ++---- static/icons/tabler/users.svg | 14 ++---- 39 files changed, 200 insertions(+), 308 deletions(-) delete mode 100644 static/icons/feather/user.svg diff --git a/Makefile b/Makefile index 0668602..e18c08d 100644 --- a/Makefile +++ b/Makefile @@ -36,46 +36,45 @@ build-site: # Build site build-icons: # Build icons rm -rf static/icons mkdir -p static/icons/feather static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/LICENSE --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/alert-circle.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/arrow-down-circle.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/arrow-left.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/arrow-right.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/arrow-up.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/at-sign.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/calendar.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/clock.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/edit.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/external-link.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/eye-off.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/eye.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/file-text.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/globe.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/bookmark.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/link.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/map-pin.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/refresh-cw.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/search.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/trash-2.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/user.svg --output-dir static/icons/feather - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/LICENSE --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/archive.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/book-2.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/circle.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/clock.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/code.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/git-fork.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/home.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/notes.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/pinned.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/robot.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/rss.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/settings.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/square-letter-m.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/tag.svg --output-dir static/icons/tabler - curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/users.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/LICENSE --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/alert-circle.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/arrow-down-circle.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/arrow-left.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/arrow-right.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/arrow-up.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/at-sign.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/calendar.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/clock.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/edit.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/external-link.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/eye-off.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/eye.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/file-text.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/globe.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/bookmark.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/link.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/map-pin.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/refresh-cw.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/search.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/feathericons/feather/master/icons/trash-2.svg --output-dir static/icons/feather + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/LICENSE --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/archive.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/book-2.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/circle.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/clock.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/code.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/git-fork.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/home.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/notes.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/pinned.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/robot.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/rss.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/settings.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/square-letter-m.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/tag.svg --output-dir static/icons/tabler + curl --silent --remote-name https://raw.githubusercontent.com/tabler/tabler-icons/master/icons/outline/users.svg --output-dir static/icons/tabler for icon in static/icons/*/*.svg; do \ - xmllint --pretty 2 $$icon --output $$icon; \ + xmlstarlet c14n --without-comments $$icon | xmllint --output $$icon --pretty 2 -; \ sed --in-place '1d' $$icon; \ done git add -f static/icons diff --git a/shell.nix b/shell.nix index d56214d..0954bb4 100644 --- a/shell.nix +++ b/shell.nix @@ -56,6 +56,7 @@ let pkgs.libxslt pkgs.unixtools.column pkgs.validator-nu + pkgs.xmlstarlet pkgs.yj ]} /bin/sh diff --git a/static/icons/feather/alert-circle.svg b/static/icons/feather/alert-circle.svg index 7279c6b..3672e20 100644 --- a/static/icons/feather/alert-circle.svg +++ b/static/icons/feather/alert-circle.svg @@ -1,26 +1,26 @@ diff --git a/static/icons/feather/arrow-down-circle.svg b/static/icons/feather/arrow-down-circle.svg index b35b28e..816acdd 100644 --- a/static/icons/feather/arrow-down-circle.svg +++ b/static/icons/feather/arrow-down-circle.svg @@ -1,13 +1,13 @@ diff --git a/static/icons/feather/arrow-left.svg b/static/icons/feather/arrow-left.svg index 483e657..aebfb9e 100644 --- a/static/icons/feather/arrow-left.svg +++ b/static/icons/feather/arrow-left.svg @@ -1,17 +1,17 @@ diff --git a/static/icons/feather/clock.svg b/static/icons/feather/clock.svg index 840143c..9c69907 100644 --- a/static/icons/feather/clock.svg +++ b/static/icons/feather/clock.svg @@ -1,13 +1,13 @@ diff --git a/static/icons/feather/eye-off.svg b/static/icons/feather/eye-off.svg index fc7cd2b..0b8c1ee 100644 --- a/static/icons/feather/eye-off.svg +++ b/static/icons/feather/eye-off.svg @@ -1,19 +1,19 @@ diff --git a/static/icons/feather/eye.svg b/static/icons/feather/eye.svg index 16af897..de178f2 100644 --- a/static/icons/feather/eye.svg +++ b/static/icons/feather/eye.svg @@ -1,13 +1,13 @@ diff --git a/static/icons/feather/trash-2.svg b/static/icons/feather/trash-2.svg index ca89ec0..462a3f7 100644 --- a/static/icons/feather/trash-2.svg +++ b/static/icons/feather/trash-2.svg @@ -1,26 +1,26 @@ diff --git a/static/icons/feather/user.svg b/static/icons/feather/user.svg deleted file mode 100644 index 47667ba..0000000 --- a/static/icons/feather/user.svg +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/static/icons/tabler/LICENSE b/static/icons/tabler/LICENSE index fe62055..974db1a 100644 --- a/static/icons/tabler/LICENSE +++ b/static/icons/tabler/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Paweł Kuna +Copyright (c) 2020-2024 Paweł Kuna Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/static/icons/tabler/archive.svg b/static/icons/tabler/archive.svg index 688c314..d55999b 100644 --- a/static/icons/tabler/archive.svg +++ b/static/icons/tabler/archive.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/book-2.svg b/static/icons/tabler/book-2.svg index 8611c4c..0800060 100644 --- a/static/icons/tabler/book-2.svg +++ b/static/icons/tabler/book-2.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/circle.svg b/static/icons/tabler/circle.svg index 6362933..5660b32 100644 --- a/static/icons/tabler/circle.svg +++ b/static/icons/tabler/circle.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/clock.svg b/static/icons/tabler/clock.svg index 3f7acd5..7ad7d57 100644 --- a/static/icons/tabler/clock.svg +++ b/static/icons/tabler/clock.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/code.svg b/static/icons/tabler/code.svg index 528fa15..f9f1ba3 100644 --- a/static/icons/tabler/code.svg +++ b/static/icons/tabler/code.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/git-fork.svg b/static/icons/tabler/git-fork.svg index 425832b..a27d387 100644 --- a/static/icons/tabler/git-fork.svg +++ b/static/icons/tabler/git-fork.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/home.svg b/static/icons/tabler/home.svg index adc5775..ebe632d 100644 --- a/static/icons/tabler/home.svg +++ b/static/icons/tabler/home.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/notes.svg b/static/icons/tabler/notes.svg index b1ea76d..a102d6e 100644 --- a/static/icons/tabler/notes.svg +++ b/static/icons/tabler/notes.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/pinned.svg b/static/icons/tabler/pinned.svg index b0332b5..74002cb 100644 --- a/static/icons/tabler/pinned.svg +++ b/static/icons/tabler/pinned.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/robot.svg b/static/icons/tabler/robot.svg index c9595a1..8db2809 100644 --- a/static/icons/tabler/robot.svg +++ b/static/icons/tabler/robot.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/rss.svg b/static/icons/tabler/rss.svg index f85d6aa..884e1a6 100644 --- a/static/icons/tabler/rss.svg +++ b/static/icons/tabler/rss.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/settings.svg b/static/icons/tabler/settings.svg index 0070dba..02bea1e 100644 --- a/static/icons/tabler/settings.svg +++ b/static/icons/tabler/settings.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/square-letter-m.svg b/static/icons/tabler/square-letter-m.svg index 0a968b5..721e549 100644 --- a/static/icons/tabler/square-letter-m.svg +++ b/static/icons/tabler/square-letter-m.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/tag.svg b/static/icons/tabler/tag.svg index e837c12..abbb8c6 100644 --- a/static/icons/tabler/tag.svg +++ b/static/icons/tabler/tag.svg @@ -1,20 +1,14 @@ - diff --git a/static/icons/tabler/users.svg b/static/icons/tabler/users.svg index 531637f..6fa6286 100644 --- a/static/icons/tabler/users.svg +++ b/static/icons/tabler/users.svg @@ -1,20 +1,14 @@ - -- cgit v1.2.3