From 8796b5d359ce2be3243e4e61548c112ce1bcf5e4 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Wed, 24 Apr 2019 22:11:43 +0000
Subject: [PATCH] Moved favicons to dist/icons. Updated installer

---
 .../icons/android-chrome-192x192.png                | Bin
 .../icons/apple-touch-icon.png                      | Bin
 browserconfig.xml => dist/icons/browserconfig.xml   |   0
 favicon-16x16.png => dist/icons/favicon-16x16.png   | Bin
 favicon-32x32.png => dist/icons/favicon-32x32.png   | Bin
 favicon.ico => dist/icons/favicon.ico               | Bin
 favicon.png => dist/icons/favicon.png               | Bin
 mstile-150x150.png => dist/icons/mstile-150x150.png | Bin
 .../icons/safari-pinned-tab.svg                     |   0
 site.webmanifest => dist/icons/site.webmanifest     |   0
 installers/common.sh                                |   4 ++++
 11 files changed, 4 insertions(+)
 rename android-chrome-192x192.png => dist/icons/android-chrome-192x192.png (100%)
 rename apple-touch-icon.png => dist/icons/apple-touch-icon.png (100%)
 rename browserconfig.xml => dist/icons/browserconfig.xml (100%)
 rename favicon-16x16.png => dist/icons/favicon-16x16.png (100%)
 rename favicon-32x32.png => dist/icons/favicon-32x32.png (100%)
 rename favicon.ico => dist/icons/favicon.ico (100%)
 rename favicon.png => dist/icons/favicon.png (100%)
 rename mstile-150x150.png => dist/icons/mstile-150x150.png (100%)
 rename safari-pinned-tab.svg => dist/icons/safari-pinned-tab.svg (100%)
 rename site.webmanifest => dist/icons/site.webmanifest (100%)

diff --git a/android-chrome-192x192.png b/dist/icons/android-chrome-192x192.png
similarity index 100%
rename from android-chrome-192x192.png
rename to dist/icons/android-chrome-192x192.png
diff --git a/apple-touch-icon.png b/dist/icons/apple-touch-icon.png
similarity index 100%
rename from apple-touch-icon.png
rename to dist/icons/apple-touch-icon.png
diff --git a/browserconfig.xml b/dist/icons/browserconfig.xml
similarity index 100%
rename from browserconfig.xml
rename to dist/icons/browserconfig.xml
diff --git a/favicon-16x16.png b/dist/icons/favicon-16x16.png
similarity index 100%
rename from favicon-16x16.png
rename to dist/icons/favicon-16x16.png
diff --git a/favicon-32x32.png b/dist/icons/favicon-32x32.png
similarity index 100%
rename from favicon-32x32.png
rename to dist/icons/favicon-32x32.png
diff --git a/favicon.ico b/dist/icons/favicon.ico
similarity index 100%
rename from favicon.ico
rename to dist/icons/favicon.ico
diff --git a/favicon.png b/dist/icons/favicon.png
similarity index 100%
rename from favicon.png
rename to dist/icons/favicon.png
diff --git a/mstile-150x150.png b/dist/icons/mstile-150x150.png
similarity index 100%
rename from mstile-150x150.png
rename to dist/icons/mstile-150x150.png
diff --git a/safari-pinned-tab.svg b/dist/icons/safari-pinned-tab.svg
similarity index 100%
rename from safari-pinned-tab.svg
rename to dist/icons/safari-pinned-tab.svg
diff --git a/site.webmanifest b/dist/icons/site.webmanifest
similarity index 100%
rename from site.webmanifest
rename to dist/icons/site.webmanifest
diff --git a/installers/common.sh b/installers/common.sh
index 21098344..66676c1a 100755
--- a/installers/common.sh
+++ b/installers/common.sh
@@ -229,6 +229,10 @@ function default_configuration() {
         sudo mv $webroot_dir/installers/raspap.service /lib/systemd/system/ || install_error "Unable to move raspap.service file"
         sudo systemctl enable raspap.service || install_error "Failed to enable raspap.service"
     fi
+
+    # Move icons to webroot
+    echo -n "Installing high-res favicons"
+    sudo mv $webroot_dir/dist/icons/* $webroot_dir
 }
 
 # Add a single entry to the sudoers file