From 8eb67bb10f4661cd4ef95dfe10846b77236a6695 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Thu, 15 Oct 2020 13:33:14 +0200
Subject: [PATCH] Fixed CMS motd

---
 CMS/nextcloud/conf.sh           | 6 +++---
 CMS/nextcloud/nextcloud-init.sh | 3 ++-
 CMS/wordpress/conf.sh           | 6 +++---
 CMS/wordpress/wordpress-init.sh | 3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CMS/nextcloud/conf.sh b/CMS/nextcloud/conf.sh
index fae000f..ef9ae54 100644
--- a/CMS/nextcloud/conf.sh
+++ b/CMS/nextcloud/conf.sh
@@ -41,9 +41,9 @@ chown "$sitename":"$sitename" -R /var/www/"$domain"/html
 #Makeing nextcloud Finalize script and setting login Notice
 curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcloud/nextcloud-init.sh -o ~/NextcloudInit-"$sitename".sh
 sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' ~/NextcloudInit-"$sitename".sh
-curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcloud/MotdNextCloud -o /etc/update-motd.d/51-nextnotice-"$sitename"
-sed -i -e 's/SITEname/'$sitename'/' /etc/update-motd.d/51-nextnotice-"$sitename"
-chmod +x /etc/update-motd.d/51-nextnotice-"$sitename"
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/nextcloud/MotdNextCloud -o /etc/update-motd.d/51-nextnotice-"${sitename//_}"
+sed -i -e 's/SITEname/'$sitename'/' /etc/update-motd.d/51-nextnotice-"${sitename//_}"
+chmod +x /etc/update-motd.d/51-nextnotice-"${sitename//_}"
 
 
 #Nextcloud logging location
diff --git a/CMS/nextcloud/nextcloud-init.sh b/CMS/nextcloud/nextcloud-init.sh
index a32f13b..3306207 100644
--- a/CMS/nextcloud/nextcloud-init.sh
+++ b/CMS/nextcloud/nextcloud-init.sh
@@ -17,7 +17,8 @@ else
 fi
 
 echo "*/5  *  *  *  * SITEname	php -f /var/www/DOMAINname/html/cron.php > /dev/null 2>&1" >> /etc/crontab
-rm -f /etc/update-motd.d/51-nextnotice-SITEname
+sn2=SITEname
+rm -f /etc/update-motd.d/51-nextnotice-${sn2//_}
 
 #Remove script
 while true; do
diff --git a/CMS/wordpress/conf.sh b/CMS/wordpress/conf.sh
index 92d895f..49eea9b 100644
--- a/CMS/wordpress/conf.sh
+++ b/CMS/wordpress/conf.sh
@@ -50,6 +50,6 @@ chown "$sitename":"$sitename" -R /var/www/"$domain"/html
 #Makeing wordpress Finalize script and setting login Notice
 curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/wordpress/wordpress-init.sh -o ~/WordpressInit-"$sitename".sh
 sed -i -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' ~/WordpressInit-"$sitename".sh
-curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/wordpress/MotdWordpress -o /etc/update-motd.d/51-wpnotice-"$sitename"
-sed -i -e 's/SITEname/'$sitename'/' /etc/update-motd.d/51-wpnotice-"$sitename"
-chmod +x /etc/update-motd.d/51-wpnotice-"$sitename"
\ No newline at end of file
+curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/wordpress/MotdWordpress -o /etc/update-motd.d/51-wpnotice-"${sitename//_}"
+sed -i -e 's/SITEname/'$sitename'/' /etc/update-motd.d/51-wpnotice-"${sitename//_}"
+chmod +x /etc/update-motd.d/51-wpnotice-"${sitename//_}"
\ No newline at end of file
diff --git a/CMS/wordpress/wordpress-init.sh b/CMS/wordpress/wordpress-init.sh
index 42d3ef5..db549f5 100644
--- a/CMS/wordpress/wordpress-init.sh
+++ b/CMS/wordpress/wordpress-init.sh
@@ -6,7 +6,8 @@ sudo -u SITEname wp --path=/var/www/DOMAINname/html plugin install https://git.i
 sudo -u SITEname wp --path=/var/www/DOMAINname/html cron event run wp_update_plugins
 sudo -u SITEname wp --path=/var/www/DOMAINname/html plugin update --all
 echo -e "\e[96m Please update all-in-one-wp-migration-unlimited plugin manually\e[39m"
-rm -f /etc/update-motd.d/51-wpnotice-SITEname
+sn2=SITEname
+rm -f /etc/update-motd.d/51-wpnotice-${sn2//_}
 
 #Remove script
 while true; do