From e311b3599040730746775da996bbb307400b801b Mon Sep 17 00:00:00 2001
From: jcorporation <mail@jcgames.de>
Date: Wed, 22 Aug 2018 13:52:16 +0100
Subject: [PATCH] Fix: don't override existing /etc/mympd/mympd.conf

---
 CMakeLists.txt |  1 -
 mkrelease.sh   | 13 +++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd72afb..2129823 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,4 +53,3 @@ install(FILES dist/htdocs/css/bootstrap.min.css DESTINATION share/${PROJECT_NAME
 install(FILES dist/htdocs/css/mympd.min.css DESTINATION share/${PROJECT_NAME}/htdocs/css/)
 install(DIRECTORY htdocs/assets DESTINATION share/${PROJECT_NAME}/htdocs)
 install(DIRECTORY DESTINATION /var/lib/${PROJECT_NAME}/)
-install(FILES contrib/mympd.conf DESTINATION /etc/${PROJECT_NAME}/)
diff --git a/mkrelease.sh b/mkrelease.sh
index 0144037..490e361 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -66,12 +66,21 @@ if [ -d /etc/systemd/system ]
 then
   if [ contrib/mympd.service -nt /etc/systemd/system/mympd.service ]
   then
-    sudo cp -v contrib/mympd.service /etc/systemd/system/
+    sudo cp contrib/mympd.service /etc/systemd/system/
     sudo systemctl daemon-reload
   fi
   sudo systemctl enable mympd  
 fi
 
+if [ -f /etc/mympd/mympd.conf ]
+then
+  echo "/etc/mympd/mympd.conf already exists"
+  cp contrib/mympd.conf /etc/mympd/mympd.conf.dist
+else
+  [ -d /etc/mympd ] || mkdir /etc/mympd
+  cp contrib/mympd.conf /etc/mympd/mympd.conf
+fi
+
 if [ -d /etc/mympd/ssl ]
 then
   echo "Certificates already created"
@@ -79,6 +88,6 @@ else
   echo "Creating certificates"
   contrib/crcert.sh
 fi
-  
+
 echo "myMPD installed"
 echo "Edit /etc/mympd/mympd.conf before starting myMPD"