Use files from git for package build

2 files changed, 23 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa1ab3185ed3..913839c1a6f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = firefox-hardening
 	pkgdesc = Firefox hardening stuff
-	pkgver = 20170309
+	pkgver = r28.af6d76d
 	pkgrel = 1
 	url = https://github.com/ntzwrk/firefox-hardening
 	arch = any
 	license = GPLv3
-	depends = firefox
-	provides = firefox-hardening=20170309
+	makedepends = git
+	optdepends = firefox
+	provides = firefox-hardening=r28.af6d76d
 	conflicts = firefox-hardening
-	source = https://raw.githubusercontent.com/ntzwrk/firefox-hardening/fcd7066a53adc64c743c0b2e379ce4bc0ede3c0e/system-addons.sh
-	source = https://raw.githubusercontent.com/ntzwrk/firefox-hardening/66bb3fdabf63057144535ca5feee584634a12dce/firefox-hardening.hook
-	sha512sums = 7a5705f7e16fd8b9a2db3c6f99d7d90e4a1cb4c05974cd235dd7ce703816c08dbd36ba6da3e38a37f467a9d0ed9845e3f70fca254fcf3695abcfc03df4c16c0c
-	sha512sums = 207cd94bdf50556529dde8068bb0c087aa17c9e838581395505b5a6b41a302ab08147872be0a8f67e8541c3945aafdb4d1fd131f64c31f860a68fb6350d133da
+	source = git+https://github.com/ntzwrk/firefox-hardening.git
+	sha512sums = SKIP
 
 pkgname = firefox-hardening
 
diff --git a/PKGBUILD b/PKGBUILD
index 1e28ac42a1f1..e1341949f366 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,29 @@
 # Maintainer: Felix Singer
 
 pkgname=firefox-hardening
-pkgver=20170309
+pkgver=r28.af6d76d
 pkgrel=1
 arch=('any')
 pkgdesc="Firefox hardening stuff"
 license=('GPLv3')
-depends=('firefox')
-makedepends=()
+makedepends=('git')
+optdepends=('firefox')
 provides=("${pkgname}=${pkgver}")
 conflicts=("${pkgname}")
-url="https://github.com/ntzwrk/firefox-hardening"
-source=("https://raw.githubusercontent.com/ntzwrk/firefox-hardening/fcd7066a53adc64c743c0b2e379ce4bc0ede3c0e/system-addons.sh"
-	"https://raw.githubusercontent.com/ntzwrk/firefox-hardening/66bb3fdabf63057144535ca5feee584634a12dce/firefox-hardening.hook")
-sha512sums=('7a5705f7e16fd8b9a2db3c6f99d7d90e4a1cb4c05974cd235dd7ce703816c08dbd36ba6da3e38a37f467a9d0ed9845e3f70fca254fcf3695abcfc03df4c16c0c'
-	    '207cd94bdf50556529dde8068bb0c087aa17c9e838581395505b5a6b41a302ab08147872be0a8f67e8541c3945aafdb4d1fd131f64c31f860a68fb6350d133da')
+url="https://github.com/ntzwrk/${pkgname}"
+source=("git+https://github.com/ntzwrk/${pkgname}.git")
+sha512sums=('SKIP')
+
+pkgver() {
+	cd ${srcdir}/${pkgname}
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
 
 package() {
-	install -m755 -D "./system-addons.sh" "${pkgdir}/usr/lib/firefox-hardening/system-addons.sh"
-	install -m644 -D "./firefox-hardening.hook" "${pkgdir}/usr/share/libalpm/hooks/firefox-hardening.hook"
+	install -m755 -D "${srcdir}/${pkgname}/beatthedeviloutofit.sh" "${pkgdir}/usr/lib/${pkgname}/beatthedeviloutofit.sh"
+	install -m644 -D "${srcdir}/${pkgname}/${pkgname}.hook" "${pkgdir}/usr/share/libalpm/hooks/${pkgname}.hook"
+
+	cp -r ${srcdir}/${pkgname}/prefs ${pkgdir}/usr/lib/firefox-hardening/
+	chmod 755 ${pkgdir}/usr/lib/${pkgname}/prefs
+	chmod 644 ${pkgdir}/usr/lib/${pkgname}/prefs/*
 }