From 182a51dfbe1fd670fe787b40fc2c98b42b3184bb Mon Sep 17 00:00:00 2001
From: davedatum <ask@davedatum.com>
Date: Tue, 5 Nov 2019 20:39:52 +0000
Subject: [PATCH] #

---
 .SRCINFO                                        |  6 +++---
 .gitignore                                      |  2 +-
 PKGBUILD                                        | 12 ++++++------
 tromjaro-theme.install => manjaro-theme.install |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename tromjaro-theme.install => manjaro-theme.install (78%)

diff --git a/.SRCINFO b/.SRCINFO
index a59ed67..4608f13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = grub-theme-live-tromjaro
 	pkgdesc = TROMjaro Linux grub theme
 	pkgver = 18.0
-	pkgrel = 1
+	pkgrel = 1.2
 	url = https://gitlab.com/tromsite/tromjaro/grub-theme
 	arch = any
 	license = GPL
 	makedepends = git
-	source = grub-theme::git+https://gitlab.com/tromsite/tromjaro/grub-theme.git#commit=338f17aca67f1a78c6a7dddd672b700c0fba7123
+	source = grub-theme::git+https://gitlab.com/tromsite/tromjaro/grub-theme.git#commit=56320c88cb4f592d273d7f1e989ccf163c3129b6
 	sha256sums = SKIP
 
 pkgname = grub-theme-live-common
@@ -19,7 +19,7 @@ pkgname = grub-theme-live-tromjaro
 	conflicts = grub-theme-live-manjaro
 
 pkgname = grub-theme-tromjaro
-	install = tromjaro-theme.install
+	install = manjaro-theme.install
 	depends = grub
 	conflicts = grub-theme-tromjaro-dev
 	conflicts = grub-theme-manjaro
diff --git a/.gitignore b/.gitignore
index 5528ea6..95115a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 !.gitignore
 !.SRCINFO
 !PKGBUILD
-!tromjaro-theme.install
\ No newline at end of file
+!manjaro-theme.install
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index f43ef3e..2807b99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 pkgbase=grub-theme-live-tromjaro
 pkgname=('grub-theme-live-common' 'grub-theme-live-tromjaro' 'grub-theme-tromjaro')
 pkgver=18.0
-pkgrel=1.1
+pkgrel=1.2
 
 pkgdesc='TROMjaro Linux grub theme'
 arch=('any')
 url="https://gitlab.com/tromsite/tromjaro/grub-theme"
 license=('GPL')
 makedepends=('git')
-source=("grub-theme::git+$url.git#commit=354496ecee545f666222c17c603c70ba1f45f873")
+source=("grub-theme::git+$url.git#commit=56320c88cb4f592d273d7f1e989ccf163c3129b6")
 sha256sums=('SKIP')
 
 package_grub-theme-live-common() {
@@ -25,15 +25,15 @@ package_grub-theme-live-tromjaro() {
 	conflicts=('grub-theme-live-common-dev' 'grub-theme-live-manjaro')
 	
     cd grub-theme
-    make PREFIX=/usr DESTDIR=${pkgdir} install_tromjaro
+    make PREFIX=/usr DESTDIR=${pkgdir} install_manjaro
 }
 
 package_grub-theme-tromjaro() {
 	depends=('grub')
 	conflicts=('grub-theme-tromjaro-dev' 'grub-theme-manjaro' 'grub-theme-manjaro-dev')
-	install=tromjaro-theme.install
+	install=manjaro-theme.install
     
-    cd grub-theme/tromjaro-live
+    cd grub-theme/manjaro-live
     sed -i -e 's,.*text = "Welcome to TROMjaro".*,#text = "Welcome to TROMjaro",' theme.txt #remove welcome message
-    find . -type f -exec install -D -m644 {} ${pkgdir}/usr/share/grub/themes/tromjaro/{} \;
+    find . -type f -exec install -D -m644 {} ${pkgdir}/usr/share/grub/themes/manjaro/{} \;
 }
\ No newline at end of file
diff --git a/tromjaro-theme.install b/manjaro-theme.install
similarity index 78%
rename from tromjaro-theme.install
rename to manjaro-theme.install
index 3761b63..9011c46 100755
--- a/tromjaro-theme.install
+++ b/manjaro-theme.install
@@ -1,15 +1,15 @@
 post_install() {
 
-  sed -i -e 's,.*GRUB_THEME=.*,GRUB_THEME="/usr/share/grub/themes/tromjaro/theme.txt",' /etc/default/grub
+  sed -i -e 's,.*GRUB_THEME=.*,GRUB_THEME="/usr/share/grub/themes/manjaro/theme.txt",' /etc/default/grub
   sed -i -e 's,.*GRUB_GFXMODE=.*,GRUB_GFXMODE=auto,' /etc/default/grub
   sed -i -e 's,.*GRUB_DISTRIBUTOR=.*,GRUB_DISTRIBUTOR="TROMjaro",' /etc/default/grub
   grub-mkconfig -o /boot/grub/grub.cfg
  
 cat << _EOF 
 
-==> Installation: Theme is added to your /etc/default/grub: GRUB_THEME="/usr/share/grub/themes/tromjaro/theme.txt"
+==> Installation: Theme is added to your /etc/default/grub: GRUB_THEME="/usr/share/grub/themes/manjaro/theme.txt"
 ==> Default resolution "auto"
-==> If an OS icon doesn't appear probably not present in /usr/share/grub/themes/tromjaro/icons simply add it or merge in
+==> If an OS icon doesn't appear probably not present in /usr/share/grub/themes/manjaro/icons simply add it or merge in
 ==> https://github.com/Ste74/grub-theme-dev
 
 _EOF
@@ -23,7 +23,7 @@ post_remove() {
 cat << _EOF
 
 ==> IMPORTANT: Edit /boot/grub/grub.cfg , remove
-==> set theme="/boot/grub/themes/tromjaro/theme.txt"
+==> set theme="/boot/grub/themes/manjaro/theme.txt"
 ==> and uncomment an existing one / default!
 ==> (Maybe without "/boot", depending on PC setup)