From 425dd248127e55027e25ec3b01d02549aedd7346 Mon Sep 17 00:00:00 2001
From: speedie
Date: Fri, 31 Mar 2023 18:05:12 +0200
Subject: [PATCH] remove invalid advice
---
Makefile | 30 ++++++++++++++++++++----------
README.html | 5 +++--
README.md | 2 +-
3 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 348740c..0f6df3d 100644
--- a/Makefile
+++ b/Makefile
@@ -79,15 +79,16 @@ uninstall:
help:
@echo spmenu Makefile help
@echo
- @echo install: Installs spmenu. You may need to run this as root.
- @echo uninstall: Uninstalls spmenu. You may need to run this as root.
- @echo dist: Creates a release for spmenu.
- @echo clean: Removes objects and tarballs.
- @echo man: Generate man page for spmenu
- @echo compat: Installs compatibility with dmenu. WARNING: This will overwrite dmenu and dmenu_run
- @echo commit: Commit to the repository
- @echo pkg_arch: Creates an Arch package based on the PKGBUILD
- @echo help: Displays this help sheet.
+ @echo install: Installs spmenu. You may need to run this as root.
+ @echo uninstall: Uninstalls spmenu. You may need to run this as root.
+ @echo install_arch: Uses the PKGBUILD to install spmenu using pacman.
+ @echo dist: Creates a release for spmenu.
+ @echo clean: Removes objects and tarballs.
+ @echo man: Generate man page for spmenu
+ @echo compat: Installs compatibility with dmenu. WARNING: This will overwrite dmenu and dmenu_run
+ @echo commit: Commit to the repository
+ @echo pkg_arch: Creates an Arch package based on the PKGBUILD
+ @echo help: Displays this help sheet.
man:
printf "%% spmenu(1) $(VERSION) | dynamic menu\n" > .man.md
@@ -104,9 +105,18 @@ pkg_arch: dist
rm -rf src/ pkg/ *.tar.gz
cp PKGBUILD spmenu-$(VERSION).PKGBUILD; mv PKGBUILD.orig PKGBUILD
+install_arch: dist
+ command -v makepkg > /dev/null || exit 1
+ [ -f PKGBUILD ] || exit 1
+ cp -f PKGBUILD PKGBUILD.orig
+ sed -i "s/VERSION/$(VERSION)/g; s/MD5SUM/$$(md5sum *.tar.gz | cut -d ' ' -f 1)/g" PKGBUILD
+ makepkg -si || exit 1
+ rm -rf src/ pkg/ *.tar.gz
+ cp PKGBUILD spmenu-$(VERSION).PKGBUILD; mv PKGBUILD.orig PKGBUILD
+
commit: man
command -v git > /dev/null || exit 1
git commit -a
git push origin master
-.PHONY: all options clean dist install uninstall pkg_arch help man commit
+.PHONY: all options clean dist install install_arch uninstall pkg_arch help man commit
diff --git a/README.html b/README.html
index b98dde0..723165b 100644
--- a/README.html
+++ b/README.html
@@ -130,8 +130,9 @@ packages.
If you are on Arch GNU/Linux, you can add my repository which
includes spmenu
as well as other useful packages.
-There’s also a PKGBUILD. To use it, simply makepkg -Si
-in the directory the PKGBUILD is located.
+There’s also a PKGBUILD. To use it, simply
+make install_arch
in the directory the PKGBUILD is
+located.
If you wish to package spmenu for your GNU/Linux distribution, feel
free to add it to this list.
TODO
diff --git a/README.md b/README.md
index 1011213..e6ad841 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,7 @@ If you are on Arch GNU/Linux, you can add
[my repository](https://git.speedie.gq/speedie-repository) which includes
`spmenu` as well as other useful packages.
-There's also a PKGBUILD. To use it, simply `makepkg -Si` in the directory
+There's also a PKGBUILD. To use it, simply `make install_arch` in the directory
the PKGBUILD is located.
If you wish to package spmenu for your GNU/Linux distribution, feel free to add