From d79bca7a290ad0bc17e88497915c651e4fb9936b Mon Sep 17 00:00:00 2001
From: davedatum <ask@davedatum.com>
Date: Sun, 3 Nov 2019 15:34:13 +0000
Subject: [PATCH] tweaks, fixed permissions

---
 .SRCINFO   | 25 +++++++++++++++++++++++++
 .gitignore |  8 ++++++++
 PKGBUILD   | 32 ++++++++++++++++----------------
 3 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 .SRCINFO
 create mode 100644 .gitignore

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 0000000..73f48a4
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,25 @@
+pkgbase = tromjaro-settings
+	pkgver = 1.2
+	pkgrel = 1
+	url = https://gitlab.com/tromsite/tromjaro/gnome-settings
+	arch = any
+	license = GPL
+	makedepends = git
+	source = tromjaro-settings::git+https://gitlab.com/tromsite/tromjaro/gnome-settings.git
+	source = tromjaro-logo.png
+	source = tromjaro-branding-install.hook
+	source = tromjaro-branding-remove.hook
+	sha256sums = SKIP
+	sha256sums = 9c870f664d3e479ddc5ac3752ad92df95f9b07a46382ec2d0b8d20712ee67060
+	sha256sums = 85ef166fc107808ada7449d23eef9a95861e4311527a741becf27cfbd2f4399a
+	sha256sums = d17518ef6b9635c78fa333487f148570c65005adee684f173c6961dbfab09cd5
+
+pkgname = tromjaro-settings
+	pkgdesc = TROMjaro Settings
+	depends = gnome-shell
+
+pkgname = tromjaro-branding
+	pkgdesc = TROMjaro Branding
+	depends = gnome-shell
+	depends = dconf
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c3ed742
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+*
+
+!tromjaro-branding-remove.hook
+!tromjaro-logo.png
+!tromjaro-branding-install.hook
+!PKGBUILD
+!.SRCINFO
+!.gitignore
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 1cac642..3b157fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: davedatum <trom@davedatum.com>
+# Maintainer: davedatum <ask at davedatum dot come>
 
 pkgbase=tromjaro-settings
 pkgname=("tromjaro-settings" "tromjaro-branding")
-pkgver=1.1
+pkgver=1.2
 pkgrel=1
 arch=("any")
 url="https://gitlab.com/tromsite/tromjaro/gnome-settings"
@@ -18,14 +18,11 @@ sha256sums=('SKIP'
             'd17518ef6b9635c78fa333487f148570c65005adee684f173c6961dbfab09cd5')
 
 _inst_dir(){
-	install -d $pkgdir/etc
-	cp -r $srcdir/$pkgbase/skel $pkgdir/etc
+	install -d "${pkgdir}/etc"
+	cp -r "${srcdir}/${pkgbase}/skel" "${pkgdir}/etc/"
 
-	install -dm700 ${srcdir}/${pkgbase}/skel/.mozilla ${pkgdir}/etc/skel/.mozilla
-	install -dm700 ${srcdir}/${pkgbase}/skel/.config/libreoffice/4 ${pkgdir}/etc/skel/.config/libreoffice/4
+	chmod -R 755 "${pkgdir}/etc/skel"
 
-	install -d $pkgdir/usr/share/glib-2.0/schemas
-	cp $srcdir/$pkgbase/schemas/99_tromjaro-settings.gschema.override $pkgdir/usr/share/glib-2.0/schemas
 }
 
 package_tromjaro-settings() {
@@ -36,9 +33,12 @@ depends=('gnome-shell')
 
 	_inst_dir	
 
-	install -Dm644 ${srcdir}/${pkgbase}/schemas/user ${pkgdir}/etc/dconf/profile/user
-	install -Dm644 ${srcdir}/${pkgbase}/schemas/10_tromjaro-defaults ${pkgdir}/etc/dconf/db/site.d/10_tromjaro-defaults
-	install -Dm644 ${srcdir}/${pkgbase}/schemas/mimeapps.list ${pkgdir}/usr/share/applications/mimeapps.list
+	install -Dm644 "${srcdir}/${pkgbase}/schemas/99_tromjaro-settings.gschema.override" \
+					"${pkgdir}/usr/share/glib-2.0/schemas/99_tromjaro-settings.gschema.override"
+
+	install -Dm644 "${srcdir}/${pkgbase}/schemas/user" "${pkgdir}/etc/dconf/profile/user"
+	install -Dm644 "${srcdir}/${pkgbase}/schemas/10_tromjaro-defaults" "${pkgdir}/etc/dconf/db/site.d/10_tromjaro-defaults"
+	install -Dm644 "${srcdir}/${pkgbase}/schemas/mimeapps.list" "${pkgdir}/usr/share/applications/mimeapps.list"
 	 
 }
 
@@ -48,11 +48,11 @@ pkgname=tromjaro-branding
 pkgdesc="TROMjaro Branding"
 depends=('gnome-shell' 'dconf')
 
-	install -Dm644 ${srcdir}/${pkgbase}/schemas/gdm ${pkgdir}/etc/dconf/profile/gdm
-	install -Dm644 ${srcdir}/${pkgbase}/schemas/10_tromjaro-branding ${pkgdir}/etc/dconf/db/gdm.d/10_tromjaro-branding
+	install -Dm644 "${srcdir}/${pkgbase}/schemas/gdm" "${pkgdir}/etc/dconf/profile/gdm"
+	install -Dm644 "${srcdir}/${pkgbase}/schemas/10_tromjaro-branding" "${pkgdir}/etc/dconf/db/gdm.d/10_tromjaro-branding"
 
-	install -Dm644 ${srcdir}/tromjaro-logo.png ${pkgdir}/usr/share/icons/manjaro/maia/tromjaro-logo.png
-	install -Dm644 ${srcdir}/tromjaro-branding-install.hook ${pkgdir}/usr/share/libalpm/hooks/tromjaro-branding-install.hook
-	install -Dm644 ${srcdir}/tromjaro-branding-remove.hook ${pkgdir}/usr/share/libalpm/hooks/tromjaro-branding-remove.hook
+	install -Dm644 "${srcdir}/tromjaro-logo.png" "${pkgdir}/usr/share/icons/manjaro/maia/tromjaro-logo.png"
+	install -Dm644 "${srcdir}/tromjaro-branding-install.hook" "${pkgdir}/usr/share/libalpm/hooks/tromjaro-branding-install.hook"
+	install -Dm644 "${srcdir}/tromjaro-branding-remove.hook" "${pkgdir}/usr/share/libalpm/hooks/tromjaro-branding-remove.hook"
 	
 }
\ No newline at end of file