#

2019-11-05 20:37:03 +00:00 · 2019-11-05 20:37:03 +00:00 · 56320c88cb
commit 56320c88cb
parent 354496ecee
82 changed files with 16 additions and 16 deletions
--- a/28
+++ b/28
@ -5,11 +5,11 @@ PREFIX = /usr/local
 CFG = $(wildcard cfg/*.cfg)

 MTHEME = \
-	$(wildcard tromjaro-live/*.png) \
-	tromjaro-live/theme.txt \
-	tromjaro-live/*.pf2
+	$(wildcard manjaro-live/*.png) \
+	manjaro-live/theme.txt \
+	manjaro-live/*.pf2

-MICONS= $(wildcard tromjaro-live/icons/*.png)
+MICONS= $(wildcard manjaro-live/icons/*.png)

 TZ = $(wildcard tz/*)

@ -30,20 +30,20 @@ uninstall_common:
 	for f in ${TZ}; do rm -f $(DESTDIR)$(PREFIX)/share/grub/tz/$$f; done
 	for f in ${LOCALES}; do rm -f $(DESTDIR)$(PREFIX)/share/grub/locales/$$f; done

-install_tromjaro:
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/grub/themes/tromjaro-live
-	install -m0644 ${MTHEME} $(DESTDIR)$(PREFIX)/share/grub/themes/tromjaro-live
+install_manjaro:
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/grub/themes/manjaro-live
+	install -m0644 ${MTHEME} $(DESTDIR)$(PREFIX)/share/grub/themes/manjaro-live

-	install -dm0755 $(DESTDIR)$(PREFIX)/share/grub/themes/tromjaro-live/icons
-	install -m0644 ${MICONS} $(DESTDIR)$(PREFIX)/share/grub/themes/tromjaro-live/icons
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/grub/themes/manjaro-live/icons
+	install -m0644 ${MICONS} $(DESTDIR)$(PREFIX)/share/grub/themes/manjaro-live/icons

-uninstall_tromjaro:
-	for f in ${MTHEME}; do rm -f $(DESTDIR)$(PREFIX)/share/grub/theme/tromjaro-live/$$f; done
-	for f in ${MICONS}; do rm -f $(DESTDIR)$(PREFIX)/share/grub/theme/tromjaro-live/icons/$$f; done
+uninstall_manjaro:
+	for f in ${MTHEME}; do rm -f $(DESTDIR)$(PREFIX)/share/grub/theme/manjaro-live/$$f; done
+	for f in ${MICONS}; do rm -f $(DESTDIR)$(PREFIX)/share/grub/theme/manjaro-live/icons/$$f; done

-install: install_common install_tromjaro
+install: install_common install_manjaro

-uninstall: uninstall_common uninstall_tromjaro
+uninstall: uninstall_common uninstall_manjaro

 dist:
 	git archive --format=tar --prefix=grub-theme-$(Version)/ $(Version) | gzip -9 > grub-theme-$(Version).tar.gz
--- a/cfg/variable.cfg
+++ b/cfg/variable.cfg
@ -1,2 +1,2 @@
-grub_theme=/boot/grub/themes/tromjaro-live/theme.txt
-timeout=10
+grub_theme=/boot/grub/themes/@ISO_NAME@-live/theme.txt
+timeout=10
--- a/tromjaro-live/background.png
+++ b/tromjaro-live/background.png
--- a/tromjaro-live/dejavu_sans_12.pf2
+++ b/tromjaro-live/dejavu_sans_12.pf2
--- a/tromjaro-live/dejavu_sans_14.pf2
+++ b/tromjaro-live/dejavu_sans_14.pf2
--- a/tromjaro-live/dejavu_sans_16.pf2
+++ b/tromjaro-live/dejavu_sans_16.pf2
--- a/tromjaro-live/dejavu_sans_24.pf2
+++ b/tromjaro-live/dejavu_sans_24.pf2
--- a/tromjaro-live/dejavu_sans_48.pf2
+++ b/tromjaro-live/dejavu_sans_48.pf2
--- a/tromjaro-live/dejavu_sans_bold_16.pf2
+++ b/tromjaro-live/dejavu_sans_bold_16.pf2
--- a/tromjaro-live/dejavu_sans_mono_12.pf2
+++ b/tromjaro-live/dejavu_sans_mono_12.pf2
--- a/tromjaro-live/highlight_c.png
+++ b/tromjaro-live/highlight_c.png
--- a/tromjaro-live/highlight_e.png
+++ b/tromjaro-live/highlight_e.png
--- a/tromjaro-live/highlight_w.png
+++ b/tromjaro-live/highlight_w.png
--- a/tromjaro-live/icons/Manjaro.i686.png
+++ b/tromjaro-live/icons/Manjaro.i686.png
--- a/tromjaro-live/icons/Manjaro.x86_64.png
+++ b/tromjaro-live/icons/Manjaro.x86_64.png
--- a/tromjaro-live/icons/antergos.png
+++ b/tromjaro-live/icons/antergos.png
--- a/tromjaro-live/icons/arch.png
+++ b/tromjaro-live/icons/arch.png
--- a/tromjaro-live/icons/archlinux.png
+++ b/tromjaro-live/icons/archlinux.png
--- a/tromjaro-live/icons/cancel.png
+++ b/tromjaro-live/icons/cancel.png
--- a/tromjaro-live/icons/chakra.png
+++ b/tromjaro-live/icons/chakra.png
--- a/tromjaro-live/icons/debian.png
+++ b/tromjaro-live/icons/debian.png
--- a/tromjaro-live/icons/deepin.png
+++ b/tromjaro-live/icons/deepin.png
--- a/tromjaro-live/icons/driver.png
+++ b/tromjaro-live/icons/driver.png
--- a/tromjaro-live/icons/edit.png
+++ b/tromjaro-live/icons/edit.png
--- a/tromjaro-live/icons/efi.png
+++ b/tromjaro-live/icons/efi.png
--- a/tromjaro-live/icons/elementary.png
+++ b/tromjaro-live/icons/elementary.png
--- a/tromjaro-live/icons/fedora.png
+++ b/tromjaro-live/icons/fedora.png
--- a/tromjaro-live/icons/find.efi.png
+++ b/tromjaro-live/icons/find.efi.png
--- a/tromjaro-live/icons/find.none.png
+++ b/tromjaro-live/icons/find.none.png
--- a/tromjaro-live/icons/frugalware.png
+++ b/tromjaro-live/icons/frugalware.png
--- a/tromjaro-live/icons/gentoo.png
+++ b/tromjaro-live/icons/gentoo.png
--- a/tromjaro-live/icons/gnu-linux.png
+++ b/tromjaro-live/icons/gnu-linux.png
--- a/tromjaro-live/icons/help.png
+++ b/tromjaro-live/icons/help.png
--- a/tromjaro-live/icons/kali.png
+++ b/tromjaro-live/icons/kali.png
--- a/tromjaro-live/icons/kaos.png
+++ b/tromjaro-live/icons/kaos.png
--- a/tromjaro-live/icons/kbd.png
+++ b/tromjaro-live/icons/kbd.png
--- a/tromjaro-live/icons/korora.png
+++ b/tromjaro-live/icons/korora.png
--- a/tromjaro-live/icons/kubuntu.png
+++ b/tromjaro-live/icons/kubuntu.png
--- a/tromjaro-live/icons/lang.png
+++ b/tromjaro-live/icons/lang.png
--- a/tromjaro-live/icons/lfs.png
+++ b/tromjaro-live/icons/lfs.png
--- a/tromjaro-live/icons/linux-mint.png
+++ b/tromjaro-live/icons/linux-mint.png
--- a/tromjaro-live/icons/linux.png
+++ b/tromjaro-live/icons/linux.png
--- a/tromjaro-live/icons/lubuntu.png
+++ b/tromjaro-live/icons/lubuntu.png
--- a/tromjaro-live/icons/macosx.png
+++ b/tromjaro-live/icons/macosx.png
--- a/tromjaro-live/icons/mageia.png
+++ b/tromjaro-live/icons/mageia.png
--- a/tromjaro-live/icons/manjaro.png
+++ b/tromjaro-live/icons/manjaro.png
--- a/tromjaro-live/icons/memtest.png
+++ b/tromjaro-live/icons/memtest.png
--- a/tromjaro-live/icons/opensuse.png
+++ b/tromjaro-live/icons/opensuse.png
--- a/tromjaro-live/icons/os.png
+++ b/tromjaro-live/icons/os.png
--- a/tromjaro-live/icons/recovery.png
+++ b/tromjaro-live/icons/recovery.png
--- a/tromjaro-live/icons/restart.png
+++ b/tromjaro-live/icons/restart.png
--- a/tromjaro-live/icons/shutdown.png
+++ b/tromjaro-live/icons/shutdown.png
--- a/tromjaro-live/icons/siduction.png
+++ b/tromjaro-live/icons/siduction.png
--- a/tromjaro-live/icons/steamos.png
+++ b/tromjaro-live/icons/steamos.png
--- a/tromjaro-live/icons/tromjaro.png
+++ b/tromjaro-live/icons/tromjaro.png
--- a/tromjaro-live/icons/type.png
+++ b/tromjaro-live/icons/type.png
--- a/tromjaro-live/icons/tz.png
+++ b/tromjaro-live/icons/tz.png
--- a/tromjaro-live/icons/ubuntu.png
+++ b/tromjaro-live/icons/ubuntu.png
--- a/tromjaro-live/icons/unknown.png
+++ b/tromjaro-live/icons/unknown.png
--- a/tromjaro-live/icons/unset.png
+++ b/tromjaro-live/icons/unset.png
--- a/tromjaro-live/icons/windows.png
+++ b/tromjaro-live/icons/windows.png
--- a/tromjaro-live/icons/xubuntu.png
+++ b/tromjaro-live/icons/xubuntu.png
--- a/tromjaro-live/logo.png
+++ b/tromjaro-live/logo.png
--- a/tromjaro-live/menu_c.png
+++ b/tromjaro-live/menu_c.png
--- a/tromjaro-live/menu_e.png
+++ b/tromjaro-live/menu_e.png
--- a/tromjaro-live/progress_bar2_c.png
+++ b/tromjaro-live/progress_bar2_c.png
--- a/tromjaro-live/progress_bar_c.png
+++ b/tromjaro-live/progress_bar_c.png
--- a/tromjaro-live/progress_bar_hl_c.png
+++ b/tromjaro-live/progress_bar_hl_c.png
--- a/tromjaro-live/select_c.png
+++ b/tromjaro-live/select_c.png
--- a/tromjaro-live/slider_c.png
+++ b/tromjaro-live/slider_c.png
--- a/tromjaro-live/slider_n.png
+++ b/tromjaro-live/slider_n.png
--- a/tromjaro-live/slider_s.png
+++ b/tromjaro-live/slider_s.png
--- a/tromjaro-live/terminus-12.pf2
+++ b/tromjaro-live/terminus-12.pf2
--- a/tromjaro-live/terminus-14.pf2
+++ b/tromjaro-live/terminus-14.pf2
--- a/tromjaro-live/terminus-16.pf2
+++ b/tromjaro-live/terminus-16.pf2
--- a/tromjaro-live/terminus-18.pf2
+++ b/tromjaro-live/terminus-18.pf2
--- a/tromjaro-live/terminus-b12.pf2
+++ b/tromjaro-live/terminus-b12.pf2
--- a/tromjaro-live/terminus-b14.pf2
+++ b/tromjaro-live/terminus-b14.pf2
--- a/tromjaro-live/terminus-b16.pf2
+++ b/tromjaro-live/terminus-b16.pf2
--- a/tromjaro-live/terminus-b18.pf2
+++ b/tromjaro-live/terminus-b18.pf2
--- a/tromjaro-live/theme.txt
+++ b/tromjaro-live/theme.txt
--- a/tromjaro-live/userpass.png
+++ b/tromjaro-live/userpass.png