From 2104ccb91a4b5c944f4dbca81cab7d47e9ff2709 Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Thu, 1 Aug 2019 15:31:34 +0200
Subject: [PATCH] favicons and sorts can stay in subdirectories and be pointed
 to by proper meta tags. do not copy these around during installation and
 poison the git tree.

---
 dist/icons/browserconfig.xml => browserconfig.xml | 2 +-
 index.php                                         | 4 ++--
 installers/common.sh                              | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)
 rename dist/icons/browserconfig.xml => browserconfig.xml (72%)

diff --git a/dist/icons/browserconfig.xml b/browserconfig.xml
similarity index 72%
rename from dist/icons/browserconfig.xml
rename to browserconfig.xml
index e8b57e57..087d949b 100644
--- a/dist/icons/browserconfig.xml
+++ b/browserconfig.xml
@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
+            <square150x150logo src="/dist/icons/mstile-150x150.png"/>
             <TileColor>#b91d47</TileColor>
         </tile>
     </msapplication>
diff --git a/index.php b/index.php
index 8189e175..fd74dc60 100755
--- a/index.php
+++ b/index.php
@@ -95,8 +95,8 @@ $theme_url = 'dist/css/'.htmlspecialchars($theme, ENT_QUOTES);
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-    <link rel="manifest" href="/site.webmanifest">
-    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
+    <link rel="manifest" href="/dist/icons/site.webmanifest">
+    <link rel="mask-icon" href="/dist/icons/safari-pinned-tab.svg" color="#5bbad5">
     <meta name="msapplication-TileColor" content="#b91d47">
     <meta name="theme-color" content="#ffffff">
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
diff --git a/installers/common.sh b/installers/common.sh
index bf3a8400..fa4d1591 100755
--- a/installers/common.sh
+++ b/installers/common.sh
@@ -149,10 +149,6 @@ function download_latest_files() {
     install_log "Cloning latest files from github"
     git clone --depth 1 https://github.com/billz/raspap-webgui /tmp/raspap-webgui || install_error "Unable to download files from github"
     sudo mv /tmp/raspap-webgui $webroot_dir || install_error "Unable to move raspap-webgui to web root"
-
-    # Move icons to webroot
-    echo -n "Installing high-res favicons"
-    sudo cp $webroot_dir/dist/icons/* $webroot_dir || install_error "Unable to move icons to web root"
 }
 
 # Sets files ownership in web root directory