From 9e9d5ef17dc79b3a192014c9e42e32fcd4d66420 Mon Sep 17 00:00:00 2001
From: Samuel Mannehed <samuel@cendio.se>
Date: Thu, 22 Dec 2022 14:02:04 +0100
Subject: [PATCH] Simplify names of favicons

All of the icons are square, only providing the size in one direction is
enough. This change lets us avoid some unnecessary complexity in the
Makefile.
---
 app/images/icons/Makefile                     |  10 ++---
 .../{novnc-120x120.png => novnc-120.png}      | Bin
 .../{novnc-144x144.png => novnc-144.png}      | Bin
 .../{novnc-152x152.png => novnc-152.png}      | Bin
 .../icons/{novnc-16x16.png => novnc-16.png}   | Bin
 .../{novnc-167x167.png => novnc-167.png}      | Bin
 .../{novnc-180x180.png => novnc-180.png}      | Bin
 .../{novnc-192x192.png => novnc-192.png}      | Bin
 .../icons/{novnc-24x24.png => novnc-24.png}   | Bin
 .../icons/{novnc-32x32.png => novnc-32.png}   | Bin
 .../icons/{novnc-40x40.png => novnc-40.png}   | Bin
 .../icons/{novnc-48x48.png => novnc-48.png}   | Bin
 .../icons/{novnc-58x58.png => novnc-58.png}   | Bin
 .../icons/{novnc-60x60.png => novnc-60.png}   | Bin
 .../icons/{novnc-64x64.png => novnc-64.png}   | Bin
 .../icons/{novnc-72x72.png => novnc-72.png}   | Bin
 .../icons/{novnc-80x80.png => novnc-80.png}   | Bin
 .../icons/{novnc-87x87.png => novnc-87.png}   | Bin
 .../icons/{novnc-96x96.png => novnc-96.png}   | Bin
 vnc.html                                      |  40 +++++++++---------
 20 files changed, 25 insertions(+), 25 deletions(-)
 rename app/images/icons/{novnc-120x120.png => novnc-120.png} (100%)
 rename app/images/icons/{novnc-144x144.png => novnc-144.png} (100%)
 rename app/images/icons/{novnc-152x152.png => novnc-152.png} (100%)
 rename app/images/icons/{novnc-16x16.png => novnc-16.png} (100%)
 rename app/images/icons/{novnc-167x167.png => novnc-167.png} (100%)
 rename app/images/icons/{novnc-180x180.png => novnc-180.png} (100%)
 rename app/images/icons/{novnc-192x192.png => novnc-192.png} (100%)
 rename app/images/icons/{novnc-24x24.png => novnc-24.png} (100%)
 rename app/images/icons/{novnc-32x32.png => novnc-32.png} (100%)
 rename app/images/icons/{novnc-40x40.png => novnc-40.png} (100%)
 rename app/images/icons/{novnc-48x48.png => novnc-48.png} (100%)
 rename app/images/icons/{novnc-58x58.png => novnc-58.png} (100%)
 rename app/images/icons/{novnc-60x60.png => novnc-60.png} (100%)
 rename app/images/icons/{novnc-64x64.png => novnc-64.png} (100%)
 rename app/images/icons/{novnc-72x72.png => novnc-72.png} (100%)
 rename app/images/icons/{novnc-80x80.png => novnc-80.png} (100%)
 rename app/images/icons/{novnc-87x87.png => novnc-87.png} (100%)
 rename app/images/icons/{novnc-96x96.png => novnc-96.png} (100%)

diff --git a/app/images/icons/Makefile b/app/images/icons/Makefile
index 5635b53e..8ee31c19 100644
--- a/app/images/icons/Makefile
+++ b/app/images/icons/Makefile
@@ -7,22 +7,22 @@ IOS_3X_SIZES := 60 87 120 180
 ALL_IOS_SIZES := $(IOS_1X_SIZES) $(IOS_2X_SIZES) $(IOS_3X_SIZES)
 
 ALL_SIZES := $(BROWSER_SIZES) $(ANDROID_SIZES) $(ALL_IOS_SIZES)
-ALL_ICONS := $(foreach SIZE, $(ALL_SIZES), novnc-$(SIZE)x$(SIZE).png)
+ALL_ICONS := $(ALL_SIZES:%=novnc-%.png)
 
 all: $(ALL_ICONS)
 
-novnc-16x16.png: novnc-icon-sm.svg
+novnc-16.png: novnc-icon-sm.svg
 	convert -density 90 \
 		-background transparent "$<" "$@"
-novnc-24x24.png: novnc-icon-sm.svg
+novnc-24.png: novnc-icon-sm.svg
 	convert -density 135 \
 		-background transparent "$<" "$@"
-novnc-32x32.png: novnc-icon-sm.svg
+novnc-32.png: novnc-icon-sm.svg
 	convert -density 180 \
 		-background transparent "$<" "$@"
 
 novnc-%.png: novnc-icon.svg
-	convert -density $$[`echo $* | cut -d x -f 1` * 90 / 48] \
+	convert -density $$[`echo $*` * 90 / 48] \
 		-background transparent "$<" "$@"
 
 clean:
diff --git a/app/images/icons/novnc-120x120.png b/app/images/icons/novnc-120.png
similarity index 100%
rename from app/images/icons/novnc-120x120.png
rename to app/images/icons/novnc-120.png
diff --git a/app/images/icons/novnc-144x144.png b/app/images/icons/novnc-144.png
similarity index 100%
rename from app/images/icons/novnc-144x144.png
rename to app/images/icons/novnc-144.png
diff --git a/app/images/icons/novnc-152x152.png b/app/images/icons/novnc-152.png
similarity index 100%
rename from app/images/icons/novnc-152x152.png
rename to app/images/icons/novnc-152.png
diff --git a/app/images/icons/novnc-16x16.png b/app/images/icons/novnc-16.png
similarity index 100%
rename from app/images/icons/novnc-16x16.png
rename to app/images/icons/novnc-16.png
diff --git a/app/images/icons/novnc-167x167.png b/app/images/icons/novnc-167.png
similarity index 100%
rename from app/images/icons/novnc-167x167.png
rename to app/images/icons/novnc-167.png
diff --git a/app/images/icons/novnc-180x180.png b/app/images/icons/novnc-180.png
similarity index 100%
rename from app/images/icons/novnc-180x180.png
rename to app/images/icons/novnc-180.png
diff --git a/app/images/icons/novnc-192x192.png b/app/images/icons/novnc-192.png
similarity index 100%
rename from app/images/icons/novnc-192x192.png
rename to app/images/icons/novnc-192.png
diff --git a/app/images/icons/novnc-24x24.png b/app/images/icons/novnc-24.png
similarity index 100%
rename from app/images/icons/novnc-24x24.png
rename to app/images/icons/novnc-24.png
diff --git a/app/images/icons/novnc-32x32.png b/app/images/icons/novnc-32.png
similarity index 100%
rename from app/images/icons/novnc-32x32.png
rename to app/images/icons/novnc-32.png
diff --git a/app/images/icons/novnc-40x40.png b/app/images/icons/novnc-40.png
similarity index 100%
rename from app/images/icons/novnc-40x40.png
rename to app/images/icons/novnc-40.png
diff --git a/app/images/icons/novnc-48x48.png b/app/images/icons/novnc-48.png
similarity index 100%
rename from app/images/icons/novnc-48x48.png
rename to app/images/icons/novnc-48.png
diff --git a/app/images/icons/novnc-58x58.png b/app/images/icons/novnc-58.png
similarity index 100%
rename from app/images/icons/novnc-58x58.png
rename to app/images/icons/novnc-58.png
diff --git a/app/images/icons/novnc-60x60.png b/app/images/icons/novnc-60.png
similarity index 100%
rename from app/images/icons/novnc-60x60.png
rename to app/images/icons/novnc-60.png
diff --git a/app/images/icons/novnc-64x64.png b/app/images/icons/novnc-64.png
similarity index 100%
rename from app/images/icons/novnc-64x64.png
rename to app/images/icons/novnc-64.png
diff --git a/app/images/icons/novnc-72x72.png b/app/images/icons/novnc-72.png
similarity index 100%
rename from app/images/icons/novnc-72x72.png
rename to app/images/icons/novnc-72.png
diff --git a/app/images/icons/novnc-80x80.png b/app/images/icons/novnc-80.png
similarity index 100%
rename from app/images/icons/novnc-80x80.png
rename to app/images/icons/novnc-80.png
diff --git a/app/images/icons/novnc-87x87.png b/app/images/icons/novnc-87.png
similarity index 100%
rename from app/images/icons/novnc-87x87.png
rename to app/images/icons/novnc-87.png
diff --git a/app/images/icons/novnc-96x96.png b/app/images/icons/novnc-96.png
similarity index 100%
rename from app/images/icons/novnc-96x96.png
rename to app/images/icons/novnc-96.png
diff --git a/vnc.html b/vnc.html
index eae82209..4665143c 100644
--- a/vnc.html
+++ b/vnc.html
@@ -18,20 +18,20 @@
     <meta charset="utf-8">
 
     <!-- Icons (see app/images/icons/Makefile for what the sizes are for) -->
-    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
-    <link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24x24.png">
-    <link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32x32.png">
-    <link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48x48.png">
-    <link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64x64.png">
-    <link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72x72.png">
-    <link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96x96.png">
-    <link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144x144.png">
-    <link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192x192.png">
+    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16.png">
+    <link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24.png">
+    <link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32.png">
+    <link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48.png">
+    <link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64.png">
+    <link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72.png">
+    <link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96.png">
+    <link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144.png">
+    <link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192.png">
     <!-- Firefox currently mishandles SVG, see #1419039
     <link rel="icon" sizes="any" type="image/svg+xml" href="app/images/icons/novnc-icon.svg">
     -->
     <!-- Repeated last so that legacy handling will pick this -->
-    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
+    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16.png">
 
     <!-- Apple iOS Safari settings -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
@@ -39,17 +39,17 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 
     <!-- @2x -->
-    <link rel="apple-touch-icon" sizes="40x40" type="image/png" href="app/images/icons/novnc-40x40.png">
-    <link rel="apple-touch-icon" sizes="58x58" type="image/png" href="app/images/icons/novnc-58x58.png">
-    <link rel="apple-touch-icon" sizes="80x80" type="image/png" href="app/images/icons/novnc-80x80.png">
-    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
-    <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png">
-    <link rel="apple-touch-icon" sizes="167x167" type="image/png" href="app/images/icons/novnc-167x167.png">
+    <link rel="apple-touch-icon" sizes="40x40" type="image/png" href="app/images/icons/novnc-40.png">
+    <link rel="apple-touch-icon" sizes="58x58" type="image/png" href="app/images/icons/novnc-58.png">
+    <link rel="apple-touch-icon" sizes="80x80" type="image/png" href="app/images/icons/novnc-80.png">
+    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120.png">
+    <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152.png">
+    <link rel="apple-touch-icon" sizes="167x167" type="image/png" href="app/images/icons/novnc-167.png">
     <!-- @3x -->
-    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png">
-    <link rel="apple-touch-icon" sizes="87x87" type="image/png" href="app/images/icons/novnc-87x87.png">
-    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
-    <link rel="apple-touch-icon" sizes="180x180" type="image/png" href="app/images/icons/novnc-180x180.png">
+    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60.png">
+    <link rel="apple-touch-icon" sizes="87x87" type="image/png" href="app/images/icons/novnc-87.png">
+    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120.png">
+    <link rel="apple-touch-icon" sizes="180x180" type="image/png" href="app/images/icons/novnc-180.png">
 
     <!-- Stylesheets -->
     <link rel="stylesheet" href="app/styles/base.css">