[debian-edu-commits] debian-edu/ 07/10: update scripts: Use variable instead of hard-coding the theme name.
Mike Gabriel
sunweaver at debian.org
Wed Aug 13 16:16:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository debian-edu-artwork.
commit e540d29d274fa40843cfb1cfd9094d728d75ff5f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Jul 7 14:33:07 2014 +0200
update scripts: Use variable instead of hard-coding the theme name.
---
debian/update-debian-edu-artwork-joy | 108 +++++++++++++++---------------
debian/update-debian-edu-artwork-spacefun | 106 +++++++++++++++--------------
2 files changed, 109 insertions(+), 105 deletions(-)
diff --git a/debian/update-debian-edu-artwork-joy b/debian/update-debian-edu-artwork-joy
index 9168dee..6f89cd8 100755
--- a/debian/update-debian-edu-artwork-joy
+++ b/debian/update-debian-edu-artwork-joy
@@ -1,27 +1,29 @@
#! /bin/sh
set -e
+EDUTHEME="joy"
+
change_ldm_background() {
update-alternatives --install /usr/share/ldm/themes/default \
- ldm-theme /usr/share/ldm/themes/debian-edu-joy 85
+ ldm-theme /usr/share/ldm/themes/debian-edu-${EDUTHEME} 85
update-alternatives --set ldm-theme \
- /usr/share/ldm/themes/debian-edu-joy
+ /usr/share/ldm/themes/debian-edu-${EDUTHEME}
}
restore_ldm_background() {
- update-alternatives --remove ldm-theme /usr/share/ldm/themes/debian-edu-joy
+ update-alternatives --remove ldm-theme /usr/share/ldm/themes/debian-edu-${EDUTHEME}
}
## GRUB
change_grub_background() {
- priority=50 # value higher than 20 used for joy-grub.png in desktop-base
+ priority=50 # value higher than 20 used for ${EDUTHEME}-grub.png in desktop-base
update-alternatives --install \
/usr/share/images/desktop-base/desktop-grub.png \
desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-joy-splash-grub.png $priority
+ /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png $priority
update-alternatives --set desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-joy-splash-grub.png
- ln -sf debian-edu-joy-splash.png /usr/share/pixmaps/splash/debian-edu-splash.png
+ /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png
+ ln -sf debian-edu-${EDUTHEME}-splash.png /usr/share/pixmaps/splash/debian-edu-splash.png
if which update-grub2 > /dev/null ; then
sync
update-grub2 || true
@@ -30,7 +32,7 @@ change_grub_background() {
restore_grub_background() {
update-alternatives --remove desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-joy-splash-grub.png
+ /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png
rm -f /usr/share/pixmaps/splash/debian-edu-splash.png
if which update-grub2 > /dev/null ; then
@@ -43,31 +45,31 @@ change_desktop_background() {
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
- /usr/share/images/desktop-base/debian-edu-joy-wallpaper01_1920x1080.svg 75
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.svg 75
update-alternatives --set desktop-background \
- /usr/share/images/desktop-base/debian-edu-joy-wallpaper01_1920x1080.svg
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.svg
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background.xml \
desktop-background.xml \
- /usr/share/images/desktop-base/debian-edu-joy.xml 20
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml 20
update-alternatives --set desktop-background.xml \
- /usr/share/images/desktop-base/debian-edu-joy.xml
-
- for WALLPAPER in debian-edu-joy-wallpaper01_1280x1024.png \
- debian-edu-joy-wallpaper01_1280x1024.svg \
- debian-edu-joy-wallpaper01_1600x1200.png \
- debian-edu-joy-wallpaper01_1600x1200.svg \
- debian-edu-joy-wallpaper01_1920x1080.svg \
- debian-edu-joy-wallpaper01_1920x1200.png \
- debian-edu-joy-wallpaper01_1920x1200.svg \
- debian-edu-joy-wallpaper01_1280x1024.png \
- debian-edu-joy-wallpaper01_1280x1024.svg \
- debian-edu-joy-wallpaper02_1600x1200.png \
- debian-edu-joy-wallpaper02_1600x1200.svg \
- debian-edu-joy-wallpaper02_1920x1080.png \
- debian-edu-joy-wallpaper02_1920x1080.svg \
- debian-edu-joy-wallpaper02_1920x1200.png \
- debian-edu-joy-wallpaper02_1920x1200.svg; do
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml
+
+ for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper01_1280x1024.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1280x1024.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1600x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1600x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1920x1080.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1920x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1920x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1280x1024.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1280x1024.svg \
+ debian-edu-${EDUTHEME}-wallpaper02_1600x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper02_1600x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1080.png \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1080.svg \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1200.svg; do
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
@@ -78,26 +80,26 @@ change_desktop_background() {
restore_desktop_background() {
update-alternatives --remove \
desktop-background \
- /usr/share/images/desktop-base/debian-edu-joy-wallpaper01_1920x1080.svg
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.svg
update-alternatives --remove \
desktop-background.xml \
- /usr/share/images/desktop-base/debian-edu-joy.xml
-
- for WALLPAPER in debian-edu-joy-wallpaper01_1280x1024.png \
- debian-edu-joy-wallpaper01_1280x1024.svg \
- debian-edu-joy-wallpaper01_1600x1200.png \
- debian-edu-joy-wallpaper01_1600x1200.svg \
- debian-edu-joy-wallpaper01_1920x1080.svg \
- debian-edu-joy-wallpaper01_1920x1200.png \
- debian-edu-joy-wallpaper01_1920x1200.svg \
- debian-edu-joy-wallpaper01_1280x1024.png \
- debian-edu-joy-wallpaper01_1280x1024.svg \
- debian-edu-joy-wallpaper02_1600x1200.png \
- debian-edu-joy-wallpaper02_1600x1200.svg \
- debian-edu-joy-wallpaper02_1920x1080.png \
- debian-edu-joy-wallpaper02_1920x1080.svg \
- debian-edu-joy-wallpaper02_1920x1200.png \
- debian-edu-joy-wallpaper02_1920x1200.svg; do
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml
+
+ for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper01_1280x1024.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1280x1024.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1600x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1600x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1920x1080.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1920x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1920x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1280x1024.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1280x1024.svg \
+ debian-edu-${EDUTHEME}-wallpaper02_1600x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper02_1600x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1080.png \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1080.svg \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1200.svg; do
update-alternatives --remove desktop-background \
/usr/share/images/desktop-base/$WALLPAPER
done
@@ -108,14 +110,14 @@ change_ksplash() {
update-alternatives --install \
/usr/share/images/desktop-base/desktop-splash \
desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-joy/background.svg 55
+ /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.svg 55
update-alternatives --set desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-joy/background.svg
+ /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.svg
}
restore_ksplash() {
update-alternatives --remove desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-joy/background.svg
+ /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.svg
}
compile_gschemas() {
@@ -124,19 +126,19 @@ compile_gschemas() {
symlink_login_background() {
if [ -f /usr/share/images/desktop-base/login-background.svg.edu-diverted ]; then
- ln -fs /usr/share/images/desktop-base/debian-edu-joy-wallpaper02_1600x1200.svg /usr/share/images/desktop-base/login-background.svg
+ ln -fs /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper02_1600x1200.svg /usr/share/images/desktop-base/login-background.svg
fi
}
symlink_kde_base_edu_js() {
- if [ -f /usr/share/debian-edu-artwork-joy/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ]; then
- ln -fs /usr/share/debian-edu-artwork-joy/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js /usr/share/kde4/apps/plasma-desktop/init/
+ if [ -f /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ]; then
+ ln -fs /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js /usr/share/kde4/apps/plasma-desktop/init/
fi
}
unlink_kde_base_edu_js() {
if [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
- [ "$(readlink /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js)" = "/usr/share/debian-edu-artwork-joy/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js" ]; then
+ [ "$(readlink /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js)" = "/usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js" ]; then
rm -f /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js
fi
}
diff --git a/debian/update-debian-edu-artwork-spacefun b/debian/update-debian-edu-artwork-spacefun
index d7e243b..eda27f1 100755
--- a/debian/update-debian-edu-artwork-spacefun
+++ b/debian/update-debian-edu-artwork-spacefun
@@ -1,28 +1,30 @@
#! /bin/sh
set -e
+EDUTHEME="spacefun"
+
change_ldm_background() {
update-alternatives --install /usr/share/ldm/themes/default \
- ldm-theme /usr/share/ldm/themes/debian-edu-spacefun 85
+ ldm-theme /usr/share/ldm/themes/debian-edu-${EDUTHEME} 85
update-alternatives --set ldm-theme \
- /usr/share/ldm/themes/debian-edu-spacefun
+ /usr/share/ldm/themes/debian-edu-${EDUTHEME}
}
restore_ldm_background() {
- update-alternatives --remove ldm-theme /usr/share/ldm/themes/debian-edu-spacefun
+ update-alternatives --remove ldm-theme /usr/share/ldm/themes/debian-edu-${EDUTHEME}
}
## GRUB
change_grub_background() {
- priority=50 # value higher than 20 used for spacefun-grub.png in desktop-base
+ priority=50 # value higher than 20 used for ${EDUTHEME}-grub.png in desktop-base
update-alternatives --install \
/usr/share/images/desktop-base/desktop-grub.png \
desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-spacefun-splash-grub.png $priority
+ /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png $priority
update-alternatives --set desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-spacefun-splash-grub.png
- ln -sf debian-edu-spacefun-splash.png /usr/share/pixmaps/splash/debian-edu-splash.png
+ /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png
+ ln -sf debian-edu-${EDUTHEME}-splash.png /usr/share/pixmaps/splash/debian-edu-splash.png
if which update-grub2 > /dev/null ; then
sync
update-grub2 || true
@@ -31,7 +33,7 @@ change_grub_background() {
restore_grub_background() {
update-alternatives --remove desktop-grub \
- /usr/share/pixmaps/splash/debian-edu-spacefun-splash-grub.png
+ /usr/share/pixmaps/splash/debian-edu-${EDUTHEME}-splash-grub.png
rm -f /usr/share/pixmaps/splash/debian-edu-splash.png
if which update-grub2 > /dev/null ; then
@@ -44,30 +46,30 @@ change_desktop_background() {
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
- /usr/share/images/desktop-base/debian-edu-spacefun-wallpaper01_1920x1080.png 75
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.png 75
update-alternatives --set desktop-background \
- /usr/share/images/desktop-base/debian-edu-spacefun-wallpaper01_1920x1080.png
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.png
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background.xml \
desktop-background.xml \
- /usr/share/images/desktop-base/debian-edu-spacefun.xml 20
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml 20
update-alternatives --set desktop-background.xml \
- /usr/share/images/desktop-base/debian-edu-spacefun.xml
- for WALLPAPER in debian-edu-spacefun-wallpaper01_1280x1024.png \
- debian-edu-spacefun-wallpaper01_1280x1024.svg \
- debian-edu-spacefun-wallpaper01_1600x1200.png \
- debian-edu-spacefun-wallpaper01_1600x1200.svg \
- debian-edu-spacefun-wallpaper01_1920x1080.svg \
- debian-edu-spacefun-wallpaper01_1920x1200.png \
- debian-edu-spacefun-wallpaper01_1920x1200.svg \
- debian-edu-spacefun-wallpaper01_1280x1024.png \
- debian-edu-spacefun-wallpaper01_1280x1024.svg \
- debian-edu-spacefun-wallpaper02_1600x1200.png \
- debian-edu-spacefun-wallpaper02_1600x1200.svg \
- debian-edu-spacefun-wallpaper02_1920x1080.png \
- debian-edu-spacefun-wallpaper02_1920x1080.svg \
- debian-edu-spacefun-wallpaper02_1920x1200.png \
- debian-edu-spacefun-wallpaper02_1920x1200.svg; do
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml
+ for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper01_1280x1024.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1280x1024.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1600x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1600x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1920x1080.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1920x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1920x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1280x1024.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1280x1024.svg \
+ debian-edu-${EDUTHEME}-wallpaper02_1600x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper02_1600x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1080.png \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1080.svg \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1200.svg; do
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
@@ -78,26 +80,26 @@ change_desktop_background() {
restore_desktop_background() {
update-alternatives --remove \
desktop-background \
- /usr/share/images/desktop-base/debian-edu-spacefun-wallpaper01_1920x1080.png
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.png
update-alternatives --remove \
desktop-background.xml \
- /usr/share/images/desktop-base/debian-edu-spacefun.xml
-
- for WALLPAPER in debian-edu-spacefun-wallpaper01_1280x1024.png \
- debian-edu-spacefun-wallpaper01_1280x1024.svg \
- debian-edu-spacefun-wallpaper01_1600x1200.png \
- debian-edu-spacefun-wallpaper01_1600x1200.svg \
- debian-edu-spacefun-wallpaper01_1920x1080.svg \
- debian-edu-spacefun-wallpaper01_1920x1200.png \
- debian-edu-spacefun-wallpaper01_1920x1200.svg \
- debian-edu-spacefun-wallpaper01_1280x1024.png \
- debian-edu-spacefun-wallpaper01_1280x1024.svg \
- debian-edu-spacefun-wallpaper02_1600x1200.png \
- debian-edu-spacefun-wallpaper02_1600x1200.svg \
- debian-edu-spacefun-wallpaper02_1920x1080.png \
- debian-edu-spacefun-wallpaper02_1920x1080.svg \
- debian-edu-spacefun-wallpaper02_1920x1200.png \
- debian-edu-spacefun-wallpaper02_1920x1200.svg; do
+ /usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml
+
+ for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper01_1280x1024.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1280x1024.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1600x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1600x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1920x1080.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1920x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1920x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper01_1280x1024.png \
+ debian-edu-${EDUTHEME}-wallpaper01_1280x1024.svg \
+ debian-edu-${EDUTHEME}-wallpaper02_1600x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper02_1600x1200.svg \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1080.png \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1080.svg \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1200.png \
+ debian-edu-${EDUTHEME}-wallpaper02_1920x1200.svg; do
update-alternatives --remove desktop-background \
/usr/share/images/desktop-base/$WALLPAPER
done
@@ -108,14 +110,14 @@ change_ksplash() {
update-alternatives --install \
/usr/share/images/desktop-base/desktop-splash \
desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-spacefun/background.png 55
+ /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.png 55
update-alternatives --set desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-spacefun/background.png
+ /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.png
}
restore_ksplash() {
update-alternatives --remove desktop-splash \
- /usr/share/kde4/apps/kdm/themes/debian-edu-spacefun/background.png
+ /usr/share/kde4/apps/kdm/themes/debian-edu-${EDUTHEME}/background.png
}
compile_gschemas() {
@@ -124,19 +126,19 @@ compile_gschemas() {
symlink_login_background() {
if [ -f /usr/share/images/desktop-base/login-background.svg.edu-diverted ]; then
- ln -fs /usr/share/images/desktop-base/debian-edu-spacefun-wallpaper01_1600x1200.svg /usr/share/images/desktop-base/login-background.svg
+ ln -fs /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1600x1200.svg /usr/share/images/desktop-base/login-background.svg
fi
}
symlink_kde_base_edu_js() {
- if [ -f /usr/share/debian-edu-artwork-spacefun/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ]; then
- ln -fs /usr/share/debian-edu-artwork-spacefun/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js /usr/share/kde4/apps/plasma-desktop/init/
+ if [ -f /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ]; then
+ ln -fs /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js /usr/share/kde4/apps/plasma-desktop/init/
fi
}
unlink_kde_base_edu_js() {
if [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
- [ "$(readlink /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js)" = "/usr/share/debian-edu-artwork-spacefun/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js" ]; then
+ [ "$(readlink /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js)" = "/usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js" ]; then
rm -f /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js
fi
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git
More information about the debian-edu-commits
mailing list