adding better tooling

5 files changed, 177 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b0a93f2acb5..68230510574a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,46 @@
 pkgbase = opencomic-bin
 	pkgdesc = Comic and Manga reader, written with Node.js and using Electron.
 	pkgver = 0.2.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/ollm/OpenComic
+	changelog = changelog.md
 	arch = x86_64
 	license = GPL3
+	depends = alsa-lib
+	depends = at-spi2-core
+	depends = cairo
+	depends = dbus
+	depends = expat
+	depends = gcc-libs
+	depends = gdk-pixbuf2
+	depends = glib2
+	depends = glibc
 	depends = gtk3
-	depends = lib32-gcc-libs
+	depends = hicolor-icon-theme
+	depends = libcups
+	depends = libdrm
+	depends = libx11
+	depends = libxcb
+	depends = libxcomposite
+	depends = libxdamage
+	depends = libxext
+	depends = libxfixes
+	depends = libxkbcommon
+	depends = libxrandr
+	depends = mesa
 	depends = nodejs
+	depends = nspr
 	depends = nss
+	depends = pango
+	depends = sh
 	provides = opencomic
 	conflicts = opencomic
 	options = strip
 	options = emptydirs
 	options = zipman
 	source = opencomic-bin-0.2.1.tar.gz::https://github.com/ollm/OpenComic/releases/download/v0.2.1/opencomic-0.2.1.x86_64.rpm
+	source = https://raw.githubusercontent.com/ollm/OpenComic/master/LICENSE
 	b2sums = d2d7effcd0e63fae25c95905d0e1d8a571b25d1ca073af7bebfc3efda25a90423d7a4307cb205be0c5bac91aa92aba65cda2b4cc9406a177ef2c868b4d70c310
+	b2sums = 399283bc59e70998486f2ae7b0af9f2f241206dd660e50808be3cef500adef2a9e8d449304f506d93bd2281e6b0729b16145173591deeb105ef545b769453e10
 
 pkgname = opencomic-bin
diff --git a/.gitignore b/.gitignore
index 4367ae4a50ac..fd1cf73e6413 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *
 !.gitignore
+!Makefile
+!PKGBUILD
 !.SRCINFO
-!PKGBUILD
\ No newline at end of file
+!changelog.md
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000000..ffa42df81816
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,90 @@
+MAKEFLAGS += --warn-undefined-variables
+SHELL=/bin/bash
+
+REPO = $(shell grep url .SRCINFO | cut -d '=' -f 2 | tr -d '[:space:]')
+VERSION = $(shell grep pkgver .SRCINFO | cut -d '=' -f 2 | tr -d '[:space:]')
+TRASH = $(shell git check-ignore * | tr '\n' ' ')
+
+# DEFAULT
+all: clean log sum build check pre clean
+
+# just build the package
+build:
+	makepkg -sfr
+
+# build and install the package
+install:
+	makepkg --install
+
+# update checksums
+sum:
+	updpkgsums
+
+# check/lint
+check:
+	@echo "shellcheck: "
+	shellcheck -e SC2148 -e SC2034 PKGBUILD || exit 0
+
+	@echo "shell formate: "
+	shfmt -d PKGBUILD || exit 0
+
+	@echo "checking PKGBUILD: "
+	namcap -i PKGBUILD
+
+	@echo "checking build: "
+	namcap -i *.pkg.*
+
+# clean up the mess
+clean:
+ifeq ($(strip $(TRASH)),)
+	@echo "nothing to clear"
+else
+	file $(TRASH)
+	@echo -n "Are you sure? [Y/n] " && read ans && if [ $${ans:-'Y'} = 'Y' ]; then \
+        trash-put -v $(TRASH) ; \
+        exit 0 ; \
+    fi
+endif
+
+# generate `changelog.md`
+log:
+	@echo "wait, it will take some time"
+	$(eval NAME := $(shell gh release --repo $(REPO) view --json name | jq -r .name))
+	echo "# Name: $(NAME) " >changelog.md
+	$(eval URL := $(shell gh release --repo $(REPO) view --json url | jq -r .url))
+	echo "### URL: $(URL)" >>changelog.md
+	$(eval PUBLISHED_AT := $(shell gh release --repo $(REPO) view --json publishedAt | jq -r .publishedAt))
+	$(eval AUTHOR := $(shell gh release --repo $(REPO) view --json author | jq -r .author.login))
+	echo "### published at '$(PUBLISHED_AT)' by $(AUTHOR)" >>changelog.md
+	echo "---" >>changelog.md
+	gh release --repo $(REPO) view --json body | jq -r .body >>changelog.md
+
+# prepare for commit
+pre:
+	shfmt -w PKGBUILD
+	makepkg --printsrcinfo > .SRCINFO
+
+	git diff
+
+	git add PKGBUILD
+	git add changelog.md
+	git add .SRCINFO
+	git add .gitignore
+	git add Makefile
+
+# commit with version bump message
+commit:
+	$(eval VERSION := $(shell read -p "enter version (pkgver=$(VERSION)): " enter ; echo $${enter}))
+	@echo "commit message: \"updating to v$(VERSION)\""
+
+	@echo -n "Are you sure? [Y/n] " && read ans && if [ $${ans:-'Y'} = 'Y' ]; then \
+        git diff --cached ; \
+        exit 0 ; \
+    fi
+
+	@echo -n "Are you sure? [Y/n] " && read ans && if [ $${ans:-'Y'} = 'Y' ]; then \
+        git commit -m "updating to v$(VERSION)" ; \
+        exit 0 ; \
+    fi
+
+	@echo "recheck everything before pushing to AUR"
diff --git a/PKGBUILD b/PKGBUILD
index 7ca3bb92456a..bea85b52872d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,23 +4,50 @@
 _pkgname="opencomic"
 pkgname="$_pkgname-bin"
 pkgver=0.2.1
-pkgrel=3
+pkgrel=4
 
 pkgdesc="Comic and Manga reader, written with Node.js and using Electron."
 arch=('x86_64')
 url="https://github.com/ollm/OpenComic"
 license=('GPL3')
 
-depends=(gtk3 lib32-gcc-libs nodejs nss)
+depends=("alsa-lib"
+	"at-spi2-core"
+	"cairo"
+	"dbus"
+	"expat"
+	"gcc-libs"
+	"gdk-pixbuf2"
+	"glib2"
+	"glibc"
+	"gtk3"
+	"hicolor-icon-theme"
+	"libcups"
+	"libdrm"
+	"libx11"
+	"libxcb"
+	"libxcomposite"
+	"libxdamage"
+	"libxext"
+	"libxfixes"
+	"libxkbcommon"
+	"libxrandr"
+	"mesa"
+	"nodejs"
+	"nspr"
+	"nss"
+	"pango"
+	"sh")
 provides=("$_pkgname")
 conflicts=("$_pkgname")
 # replaces=("$_pkgname")
-# options=(debug !strip emptydirs zipman)
 options=(strip emptydirs zipman)
-# install="$pkgname.install"
+changelog="changelog.md"
 
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ollm/OpenComic/releases/download/v${pkgver}/opencomic-${pkgver}.x86_64.rpm")
-b2sums=('d2d7effcd0e63fae25c95905d0e1d8a571b25d1ca073af7bebfc3efda25a90423d7a4307cb205be0c5bac91aa92aba65cda2b4cc9406a177ef2c868b4d70c310')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ollm/OpenComic/releases/download/v${pkgver}/opencomic-${pkgver}.${CARCH}.rpm"
+	"https://raw.githubusercontent.com/ollm/OpenComic/master/LICENSE")
+b2sums=('d2d7effcd0e63fae25c95905d0e1d8a571b25d1ca073af7bebfc3efda25a90423d7a4307cb205be0c5bac91aa92aba65cda2b4cc9406a177ef2c868b4d70c310'
+	'399283bc59e70998486f2ae7b0af9f2f241206dd660e50808be3cef500adef2a9e8d449304f506d93bd2281e6b0729b16145173591deeb105ef545b769453e10')
 
 build() {
 	# modifying .desktop file
@@ -29,27 +56,30 @@ build() {
 
 package() {
 	# copying file
-	install -vdm 755 "${pkgdir}/usr/share/"
-	cp -vaR usr/share/* "${pkgdir}/usr/share/"
-	install -vdm 755 "${pkgdir}/opt/${pkgname}"
-	cp -vaR opt/OpenComic/* "${pkgdir}/opt/${pkgname}"
+	install -dm 755 "${pkgdir}/usr/share/"
+	cp -aR usr/share/* "${pkgdir}/usr/share/"
+	install -dm 755 "${pkgdir}/opt/${pkgname}"
+	cp -aR opt/OpenComic/* "${pkgdir}/opt/${pkgname}"
 
 	# Fix permissions
 	for d in locales resources; do
-		chmod -v 755 "${pkgdir}/opt/${pkgname}/$d"
-		find "${pkgdir}/opt/${pkgname}/$d" -type d -exec chmod -v 755 {} +
+		chmod 755 "${pkgdir}/opt/${pkgname}/$d"
+		find "${pkgdir}/opt/${pkgname}/$d" -type d -exec chmod 755 {} +
 	done
 
 	# Link entry point
-	install -vdm 755 "${pkgdir}/usr/bin"
-	ln -vsf "/opt/${pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
+	install -dm 755 "${pkgdir}/usr/bin"
+	ln -sf "/opt/${pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
 
 	# Remove unused files
-	rm -vrf "${pkgdir}/usr/lib"
-	rm -vrf "${pkgdir}/opt/${pkgname}"/{usr,swiftshader,AppRun,${_pkgname}.{desktop,png}}
-	rm -vrf "${pkgdir}/opt/${pkgname}"/{libGLESv2.so,libEGL.so,libvk_swiftshader.so,libvulkan.so}
-	rm -vrf "${pkgdir}/opt/${pkgname}/resources/app.asar.unpacked/unrar"
-	rm -vrf "${pkgdir}/opt/${pkgname}/resources/app.asar.unpacked/node_modules/7zip-bin/mac"
-	rm -vrf "${pkgdir}/opt/${pkgname}/resources/app.asar.unpacked/node_modules/7zip-bin/linux/"/{arm64/,arm/,ia32/}
-	rm -vrf "${pkgdir}/opt/${pkgname}"/{locales,LICENSE*}
+	rm -rf "${pkgdir}/usr/lib"
+	rm -rf "${pkgdir}/opt/${pkgname}"/{usr,swiftshader,AppRun,${_pkgname}.{desktop,png}}
+	rm -rf "${pkgdir}/opt/${pkgname}"/{libGLESv2.so,libEGL.so,libvk_swiftshader.so,libvulkan.so}
+	rm -rf "${pkgdir}/opt/${pkgname}/resources/app.asar.unpacked/unrar"
+	rm -rf "${pkgdir}/opt/${pkgname}/resources/app.asar.unpacked/node_modules/7zip-bin/mac"
+	rm -rf "${pkgdir}/opt/${pkgname}/resources/app.asar.unpacked/node_modules/7zip-bin/linux/"/{arm64/,arm/,ia32/}
+	rm -rf "${pkgdir}/opt/${pkgname}"/{locales,LICENSE*}
+
+	# Install LICENSE file
+	install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/changelog.md b/changelog.md
new file mode 100644
index 000000000000..af61f4288f2e
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,5 @@
+# Name: v0.2.1 
+### URL: https://github.com/ollm/OpenComic/releases/tag/v0.2.1
+### published at '2021-06-08T14:06:32Z' by ollm
+---
+