VesperOS/desktop-base
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include GRUB text/background colors in the theme pack / alternatives system. (Closes: #606383)

Browse Source
This commit is contained in:
Aurélien COUDERC
2016-11-09 23:31:28 +00:00
parent 3da0f5d5d1
commit cfe0cd284f
12 changed files with 63 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -79,9 +79,6 @@ install-local:
mkdir -p $(DESTDIR)/usr/share/gnome-background-properties
$(INSTALL) gnome-backgrounds.xml $(DESTDIR)/usr/share/gnome-background-properties/debian.xml
# grub
$(INSTALL) grub/grub_background.sh $(DESTDIR)/usr/share/desktop-base/
# plymouth
install -d $(DESTDIR)/usr/share/plymouth/themes/spacefun
$(INSTALL) $(wildcard plymouth/spacefun/*) $(DESTDIR)/usr/share/plymouth/themes/spacefun

2
debian/changelog vendored
View File

@@ -4,6 +4,8 @@ desktop-base (9.0.0~exp2) UNRELEASED; urgency=medium
* Remove Moreblue theme from Lenny.
* Generate all GRUB bitmaps from SVG at build time instead of versionning
them.
* Include GRUB text/background colors in the theme pack / alternatives
system. (Closes: #606383)
* Fix detection of update-initramfs. (Closes: #843727)

43
debian/postinst vendored
View File

@@ -148,42 +148,51 @@ EOF
desktop-sddm-preview \
/usr/share/desktop-base/joy-theme/sddm-preview.jpg
# Alternatives for grub
# Set up an alternative for the GRUB background/colors config
# Highest priority for active theme
## Favor widescreen / hi-res background for efi installations
num_grub_efi_installed=$(dpkg-query --list "grub-efi*" 2> /dev/null | grep "^i" | wc -l)
if [ $num_grub_efi_installed -gt 0 ] ; then
grub_prio_4x3=15
grub_prio_16x9=20
grub_prio_4x3=45
grub_prio_16x9=50
else
grub_prio_4x3=20
grub_prio_16x9=15
grub_prio_4x3=50
grub_prio_16x9=45
fi
update-alternatives --install \
/usr/share/images/desktop-base/desktop-grub.png \
desktop-grub \
/usr/share/desktop-base/active-theme/grub/grub-4x3.png $grub_prio_4x3
/usr/share/desktop-base/active-theme/grub/grub-4x3.png $grub_prio_4x3 \
--slave /usr/share/desktop-base/grub_background.sh \
desktop-grub.sh \
/usr/share/desktop-base/active-theme/grub/grub_background.sh
update-alternatives --install \
/usr/share/images/desktop-base/desktop-grub.png \
desktop-grub \
/usr/share/desktop-base/active-theme/grub/grub-16x9.png $grub_prio_16x9
/usr/share/desktop-base/active-theme/grub/grub-16x9.png $grub_prio_16x9 \
--slave /usr/share/desktop-base/grub_background.sh \
desktop-grub.sh \
/usr/share/desktop-base/active-theme/grub/grub_background.sh
# Alternatives for theme packages
while read theme ratio priority; do
update-alternatives --install /usr/share/images/desktop-base/desktop-grub.png \
desktop-grub \
/usr/share/desktop-base/$theme-theme/grub/grub-$ratio.png $priority
/usr/share/desktop-base/$theme-theme/grub/grub-$ratio.png $priority \
--slave /usr/share/desktop-base/grub_background.sh \
desktop-grub.sh \
/usr/share/desktop-base/$theme-theme/grub/grub_background.sh
done << EOF
softwaves 4x3 15
softwaves 16x9 15
lines 4x3 14
lines 16x9 14
joy 4x3 14
joy 16x9 14
spacefun 4x3 14
spacefun 16x9 14
softwaves 4x3 40
softwaves 16x9 40
lines 4x3 30
lines 16x9 30
joy 4x3 30
joy 16x9 30
spacefun 4x3 30
spacefun 16x9 30
EOF
# GRUB background
# Apply GRUB background update into /boot
if which update-grub2 > /dev/null ; then
# Ensure the background image file has actually been written to disc
# before updating.

22
debian/prerm vendored
View File

@@ -123,6 +123,9 @@ EOF
# Remove grub background alternatives
# For theme packages
while read theme ratio; do
update-alternatives --remove \
desktop-grub.sh \
/usr/share/desktop-base/$theme-theme/grub/grub_background.sh
update-alternatives --remove \
desktop-grub \
/usr/share/desktop-base/$theme-theme/grub/grub-$ratio.png
@@ -145,6 +148,9 @@ EOF
remove_first_ratio=16x9
remove_last_ratio=4x3
fi
update-alternatives --remove \
desktop-grub.sh \
/usr/share/desktop-base/active-theme/grub/grub_background.sh
update-alternatives --remove \
desktop-grub \
/usr/share/desktop-base/active-theme/grub/grub-$remove_first_ratio.png
@@ -152,6 +158,22 @@ EOF
desktop-grub \
/usr/share/desktop-base/active-theme/grub/grub-$remove_last_ratio.png
# Remove alternative for the GRUB background/colors config
# Alternatives for theme packages
while read theme priority; do
update-alternatives --remove \
desktop-grub.sh \
/usr/share/desktop-base/$theme-theme/grub/grub_background.sh
done << EOF
softwaves
lines
EOF
# *Lastly* remove *highest priority* alternative
update-alternatives --remove \
desktop-grub.sh \
/usr/share/desktop-base/active-theme/grub/grub_background.sh
# Remove theme package alternatives
while read theme; do
update-alternatives --remove \

2
joy-theme/grub/Makefile
View File

@@ -11,7 +11,7 @@ clean:
install:
install -d $(DESTDIR)/$(dir)
$(INSTALL) $(wildcard *.png) $(DESTDIR)/$(dir)
$(INSTALL) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
grub-4x3.png: grub-4x3.svg
rsvg-convert $< > $@

3
joy-theme/grub/grub_background.sh Normal file
View File

@@ -0,0 +1,3 @@
WALLPAPER=/usr/share/images/desktop-base/desktop-grub.png
COLOR_NORMAL=light-gray/black
COLOR_HIGHLIGHT=black/white

2
lines-theme/grub/Makefile
View File

@@ -11,7 +11,7 @@ clean:
install:
install -d $(DESTDIR)/$(dir)
$(INSTALL) $(wildcard *.png) $(DESTDIR)/$(dir)
$(INSTALL) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
grub-4x3.png: grub-4x3.svg
rsvg-convert $< > $@

0
grub/grub_background.sh → lines-theme/grub/grub_background.sh
View File

2
softwaves-theme/grub/Makefile
View File

@@ -11,7 +11,7 @@ clean:
install:
install -d $(DESTDIR)/$(dir)
$(INSTALL) $(wildcard *.png) $(DESTDIR)/$(dir)
$(INSTALL) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
grub-4x3.png: grub-4x3.svg
rsvg-convert $< > $@

3
softwaves-theme/grub/grub_background.sh Normal file
View File

@@ -0,0 +1,3 @@
WALLPAPER=/usr/share/images/desktop-base/desktop-grub.png
COLOR_NORMAL=white/black
COLOR_HIGHLIGHT=black/white

2
spacefun-theme/grub/Makefile
View File

@@ -11,7 +11,7 @@ clean:
install:
install -d $(DESTDIR)/$(dir)
$(INSTALL) $(wildcard *.png) $(DESTDIR)/$(dir)
$(INSTALL) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
grub-4x3.png: grub-4x3.svg
rsvg-convert $< > $@

3
spacefun-theme/grub/grub_background.sh Normal file
View File

@@ -0,0 +1,3 @@
WALLPAPER=/usr/share/images/desktop-base/desktop-grub.png
COLOR_NORMAL=light-gray/black
COLOR_HIGHLIGHT=white/black