From 9bcdc70cd816858622cc49d7fc9fb53412e40ee0 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Tue, 17 Jul 2018 12:18:08 +0200
Subject: [PATCH] feat(CMakeLists.txt): do not deal with custom app_logo,
 replace it directly

---
 CMakeLists.txt           | 9 +--------
 assets/icons/genicons.sh | 8 +-------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d614df15b..6c22eea9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -433,14 +433,7 @@ if (UNIX AND NOT APPLE)
   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE_NAME}.desktop"
     DESTINATION "${CMAKE_INSTALL_DATADIR}/applications"
   )
-
-  if (EXISTS "${ASSETS_DIR}/images/custom/app_logo.svg")
-    set(APP_LOGO_PATH "${ASSETS_DIR}/images/custom/app_logo.svg")
-  else ()
-    set(APP_LOGO_PATH "${ASSETS_DIR}/images/app_logo.svg")
-  endif ()
-
-  install(FILES ${APP_LOGO_PATH}
+  install(FILES "${ASSETS_DIR}/images/app_logo.svg"
     DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps/"
     RENAME "${EXECUTABLE_NAME}.svg"
   )
diff --git a/assets/icons/genicons.sh b/assets/icons/genicons.sh
index 397bf7792..adf8df433 100755
--- a/assets/icons/genicons.sh
+++ b/assets/icons/genicons.sh
@@ -1,13 +1,7 @@
 #!/usr/bin/env bash
 
-if [ -f ../images/custom/app_logo.svg ] ; then
-  src=../images/custom/app_logo.svg
-else
-  src=../images/app_logo.svg
-fi
-
 for i in 16 22 24 32 64 128
 do
   mkdir -p hicolor/${i}x${i}/apps
-  inkscape -z -e hicolor/${i}x${i}/apps/icon.png -w $i -h $i $src
+  inkscape -z -e hicolor/${i}x${i}/apps/icon.png -w $i -h $i ../images/app_logo.svg
 done