[debian-edu-commits] debian-edu/ 01/01: Set plymouth default theme only if a Debian Edu system is installed. Thanks to Andreas Beckmann. (Closes: #856789).

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-artwork.

commit 5bb54f1ad5b6a951132981e596c2b969b5dee0ab
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sat Mar 4 23:11:50 2017 +0100

    Set plymouth default theme only if a Debian Edu system is installed.
    Thanks to Andreas Beckmann. (Closes: #856789).
---
 debian/changelog                             | 7 +++++++
 debian/debian-edu-artwork-softwaves.postinst | 3 ++-
 debian/update-debian-edu-artwork-lines       | 2 +-
 debian/update-debian-edu-artwork-softwaves   | 2 +-
 debian/update-debian-edu-artwork-spacefun    | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 019e0fe..0e409b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu-artwork (0.902-3) UNRELEASED; urgency=medium
+
+  * Set plymouth default theme only if a Debian Edu system is installed.
+    Thanks to Andreas Beckmann. (Closes: #856789).
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sat, 04 Mar 2017 22:49:27 +0100
+
 debian-edu-artwork (0.902-2) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/debian/debian-edu-artwork-softwaves.postinst b/debian/debian-edu-artwork-softwaves.postinst
index 74e3e16..a6e1d03 100755
--- a/debian/debian-edu-artwork-softwaves.postinst
+++ b/debian/debian-edu-artwork-softwaves.postinst
@@ -8,6 +8,7 @@ EDUTHEME="softwaves"
 
 # Make softwaves the default for stretch via triggers;
 # see debian-edu-artwork-softwaves.triggers
+# Set plymouth default theme only for Debian Edu installations.
 
 case "$1" in
 	configure)
@@ -15,7 +16,7 @@ case "$1" in
 	;;
 	triggered)
 		update-debian-edu-artwork-$EDUTHEME configure
-		if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
+		if [ -f /etc/plymouth/plymouthd.conf ] && [ -f /etc/debian-edu/config ] && which plymouth-set-default-theme > /dev/null ; then
 			plymouth-set-default-theme -R debian-edu-${EDUTHEME}
 		fi
 	;;
diff --git a/debian/update-debian-edu-artwork-lines b/debian/update-debian-edu-artwork-lines
index a92ed97..79d45da 100755
--- a/debian/update-debian-edu-artwork-lines
+++ b/debian/update-debian-edu-artwork-lines
@@ -112,7 +112,7 @@ compile_gschemas() {
 
 ## Plymouth
 set_plymouth_theme() {
-    if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
+    if [ -f /etc/plymouth/plymouthd.conf ] && [ -f /etc/debian-edu/config ] && which plymouth-set-default-theme > /dev/null ; then
         plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
     fi
 }
diff --git a/debian/update-debian-edu-artwork-softwaves b/debian/update-debian-edu-artwork-softwaves
index 24b7157..1abe299 100755
--- a/debian/update-debian-edu-artwork-softwaves
+++ b/debian/update-debian-edu-artwork-softwaves
@@ -120,7 +120,7 @@ compile_gschemas() {
 
 ## Plymouth
 set_plymouth_theme() {
-    if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
+    if [ -f /etc/plymouth/plymouthd.conf ] && [ -f /etc/debian-edu/config ] && which plymouth-set-default-theme > /dev/null ; then
         plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
     fi
 }
diff --git a/debian/update-debian-edu-artwork-spacefun b/debian/update-debian-edu-artwork-spacefun
index 47c04a1..733e261 100755
--- a/debian/update-debian-edu-artwork-spacefun
+++ b/debian/update-debian-edu-artwork-spacefun
@@ -114,7 +114,7 @@ compile_gschemas() {
 
 ## Plymouth
 set_plymouth_theme() {
-    if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
+    if [ -f /etc/plymouth/plymouthd.conf ] && [ -f /etc/debian-edu/config ] && which plymouth-set-default-theme > /dev/null ; then
         plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
     fi
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git