move color configuration into PKGBUILD

4 files changed, 12 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d2a3f1430acb..8538bbd31ae2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = materia-custom-accent
 	pkgdesc = Easy installer for the materia theme with a custom accent color, gdm and qt5 support and a workaround for dark apps (edit PKGBUILD)
-	pkgver = r1211.c95281e8
+	pkgver = r1254.b8b04af5
 	pkgrel = 1
 	url = https://github.com/nana-4/materia-theme
 	arch = any
 	license = GPL
 	makedepends = bc
 	makedepends = sassc
-	makedepends = inkscape
+	makedepends = resvg
 	depends = gtk3>=3.22
 	depends = gtk-engine-murrine
 	depends = gnome-themes-extra
@@ -16,13 +16,9 @@ pkgbase = materia-custom-accent
 	conflicts = kvantum-theme-materia
 	source = materia-theme::git+https://github.com/nana-4/materia-theme.git
 	source = materia-theme-qt::git+https://github.com/PapirusDevelopmentTeam/materia-kde.git
-	source = colors
-	source = colors-dark
 	source = 99-gdm-use-materia-theme.hook
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 6cbc8dee30cb20f6124e5d1c2816be694322733d8058b014fa2280879c0f520f
-	sha256sums = bee6e51a3707667d796c3b827e4e6494bcbbf26d47c96f40e08c2f56d528bec1
 	sha256sums = 7db390763b37c3cc2c2984a8a3e8452d1822ac579def6a07eecbee076fb73d77
 
 pkgname = materia-custom-accent
diff --git a/PKGBUILD b/PKGBUILD
index 7965d3d71527..4aef9809021e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,16 @@
 pkgname=materia-custom-accent
 _pkgname=materia-theme
 _accent=c85a5a
+_colors="     SEL_BG=$_accent FG=212121 \n BG=eeeeee \n HDR_FG=eeeeee \n HDR_BG=303030 \n MATERIA_VIEW=ffffff \n MATERIA_SURFACE=fafafa"
+_colors_dark="SEL_BG=$_accent FG=eeeeee \n BG=212121 \n HDR_FG=e0e0e0 \n HDR_BG=303030 \n MATERIA_VIEW=303030 \n MATERIA_SURFACE=424242"
 pkgdesc="Easy installer for the materia theme with a custom accent color, gdm and qt5 support and a workaround for dark apps (edit PKGBUILD)"
 arch=('any')
 url="https://github.com/nana-4/materia-theme"
 _url_qt="https://github.com/PapirusDevelopmentTeam/materia-kde"
-pkgver=r1211.c95281e8
+pkgver=r1254.b8b04af5
 pkgrel=1
 license=('GPL')
-makedepends=(bc sassc inkscape)
+makedepends=(bc sassc resvg)
 depends=('gtk3>=3.22' 'gtk-engine-murrine' 'gnome-themes-extra' 'kvantum-qt5')
 optdepends=()
 provides=()
@@ -17,33 +19,29 @@ conflicts=('materia-theme' 'kvantum-theme-materia')
 replaces=()
 source=(${_pkgname}::git+$url.git
         ${_pkgname}-qt::git+$_url_qt.git
-        colors
-        colors-dark
         99-gdm-use-materia-theme.hook)
 sha256sums=('SKIP'
             'SKIP'
-            '6cbc8dee30cb20f6124e5d1c2816be694322733d8058b014fa2280879c0f520f'
-            'bee6e51a3707667d796c3b827e4e6494bcbbf26d47c96f40e08c2f56d528bec1'
             '7db390763b37c3cc2c2984a8a3e8452d1822ac579def6a07eecbee076fb73d77')
 pkgver() {
   cd "${srcdir}/${_pkgname}"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
+
 prepare(){
-  cd "${srcdir}"
-  sed "s/MY-COLOR/$_accent/" -i colors colors-dark
-  
-  cd materia-theme-qt/Kvantum
+  cd "${srcdir}/materia-theme-qt/Kvantum"
   sed "s/4285f4/$_accent/" -i */*
 }
+
 build(){
   cd "${srcdir}/${_pkgname}"
-  ./change_color.sh -t "${srcdir}/themes" -o $pkgname      "${srcdir}/colors"
-  ./change_color.sh -t "${srcdir}/themes" -o $pkgname-dark "${srcdir}/colors-dark"
+  ./change_color.sh -t "${srcdir}/themes" -o $pkgname      <( echo -e "$_colors")
+  ./change_color.sh -t "${srcdir}/themes" -o $pkgname-dark <( echo -e "$_colors_dark")
   
   cp "${srcdir}/themes/$pkgname-dark/gtk-3.0/gtk.css" \
      "${srcdir}/themes/$pkgname/gtk-3.0/gtk-dark.css"
 }
+
 package() {
   mkdir -p "${pkgdir}/usr/share/themes"
   cp -r "${srcdir}"/themes/* "${pkgdir}/usr/share/themes"
diff --git a/colors b/colors
deleted file mode 100644
index 15ea77164b1f..000000000000
--- a/colors
+++ /dev/null
@@ -1,7 +0,0 @@
-SEL_BG=MY-COLOR
-FG=212121
-BG=eeeeee
-HDR_FG=eeeeee
-HDR_BG=303030
-MATERIA_VIEW=ffffff
-MATERIA_SURFACE=fafafa
diff --git a/colors-dark b/colors-dark
deleted file mode 100644
index df87d1190ec2..000000000000
--- a/colors-dark
+++ /dev/null
@@ -1,7 +0,0 @@
-SEL_BG=MY-COLOR
-FG=eeeeee
-BG=212121
-HDR_FG=e0e0e0
-HDR_BG=303030
-MATERIA_VIEW=303030
-MATERIA_SURFACE=424242