remove unnecessary file name in source, patch get-version increment

2 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 043eafe1a679..80a0c2b14442 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,7 +10,7 @@ pkgbase = gnome-shell-extension-color-picker
 	depends = dconf
 	depends = gnome-shell
 	source = tuberry-color-picker-37.tar.gz::https://github.com/tuberry/color-picker/tarball/e0877dd
-	source = gnome-shell-sass-adeed6c9b448521bf044bb153f0f29dc950c33ea.tar::https://gitlab.gnome.org/GNOME/gnome-shell-sass/-/archive/adeed6c9b448521bf044bb153f0f29dc950c33ea/gnome-shell-sass.tar
+	source = gnome-shell-sass-adeed6c9b448521bf044bb153f0f29dc950c33ea.tar::https://gitlab.gnome.org/GNOME/gnome-shell-sass/-/archive/adeed6c9b448521bf044bb153f0f29dc950c33ea/.tar
 	sha256sums = 721c74569febe9e008881ada90307b4d86de65e4c076c9a218426ec96de7cb6a
 	sha256sums = a7ce4d4aec881a2f5505f13506eb5139f1ab3cc1192be916c8ad59686c3b6919
 
diff --git a/PKGBUILD b/PKGBUILD
index c2de2510ab5a..f564c49c49aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gnome-shell-extension-color-picker
 _pkgbase=tuberry-color-picker
-pkgver=37
+pkgver=37 # should be 36 but I didn't notice get-version.sh increments by 1, now fixed but can't "downgrade"
 _commit=e0877dd
 _sass_commit=adeed6c9b448521bf044bb153f0f29dc950c33ea
 pkgrel=2
@@ -14,12 +14,14 @@ license=('GPL3')
 depends=('dconf' 'gnome-shell')
 makedepends=('meson' 'sassc')
 source=("${_pkgbase}-${pkgver}.tar.gz::${url}/tarball/${_commit}"
-        "gnome-shell-sass-${_sass_commit}.tar::https://gitlab.gnome.org/GNOME/gnome-shell-sass/-/archive/${_sass_commit}/gnome-shell-sass.tar")
+        "gnome-shell-sass-${_sass_commit}.tar::https://gitlab.gnome.org/GNOME/gnome-shell-sass/-/archive/${_sass_commit}/.tar")
 sha256sums=('721c74569febe9e008881ada90307b4d86de65e4c076c9a218426ec96de7cb6a'
             'a7ce4d4aec881a2f5505f13506eb5139f1ab3cc1192be916c8ad59686c3b6919')
 
 prepare() {
-  cp -r gnome-shell-sass-${_sass_commit}/. "${_pkgbase}-${_commit}/res/styles/gnome-shell-sass"
+  cp -r gnome-shell-sass-${_sass_commit}/. ${_pkgbase}-${_commit}/res/styles/gnome-shell-sass
+  # remove package version increment on build
+  sed -i -e 's/{} + 1/{}/g' ${_pkgbase}-${_commit}/cli/get-version.sh
 }
 
 build() {