aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <urchlay@slackware.uk>2026-10-20 04:13:40 -0400
committerB. Watson <urchlay@slackware.uk>2026-10-20 04:14:22 -0400
commite553d91919a771d96afea904239cf2cd32ed1cd7 (patch)
tree80db9b666c458e1eaea51eb5920c24e0b0cf1734
parentddc4d373efc221209aa8b7b15bf4b0b19ce9ed80 (diff)
downloadsbo-maintainer-tools-e553d91919a771d96afea904239cf2cd32ed1cd7.tar.gz
Do not install sbrun, describe it as experimental and incomplete in README.
-rw-r--r--Makefile4
-rw-r--r--README6
-rwxr-xr-xsbodl11
3 files changed, 15 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 0097eed..4d2a94f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ MAN1DIR=$(MANDIR)/man1
DOCDIR=$(PREFIX)/doc/$(PROJ)-$(VERSION)
DOCS=README QUICKSTART TODO pre-commit-sbolint NEWS CREDITS
-SCRIPTS=sbopkglint sbolint sbofixinfo sbodl explodepkg.sbopkglint find_installed_orphans find_installed_removed sbrun upkg
+SCRIPTS=sbopkglint sbolint sbofixinfo sbodl explodepkg.sbopkglint find_installed_orphans find_installed_removed upkg
all:
@echo "Use 'make install PREFIX=<path>' to install $(PROJ)."
@@ -40,7 +40,7 @@ install: man
clean:
rm -f sbopkglint.1 sbolint.1 sbofixinfo.1 sbodl.1
-man: sbopkglint.1 sbolint.1 sbofixinfo.1 sbodl.1 sbrun.1
+man: sbopkglint.1 sbolint.1 sbofixinfo.1 sbodl.1
sbolint.1: sbolint
./sbolint --man > sbolint.1
diff --git a/README b/README
index 85e4b6d..5522b82 100644
--- a/README
+++ b/README
@@ -37,8 +37,10 @@ Included tools:
parse SBo .info files and SlackBuild scripts to find the package
name to install.
-- sbrun: Wrapper for running SlackBuild scripts, which can track
- files written/modified outside of $TMP.
+- sbrun: EXPERIMENTAL wrapper for running SlackBuild scripts, which
+ can track files written/modified outside of $TMP. This is
+ incomplete, and not yet installed by "make install". Use it at your
+ own peril.
Note that the SBo admins use sbolint and sbopkglint as part of the
approval process, when you submit an update. Failure to pass the lint
diff --git a/sbodl b/sbodl
index cb07716..b9db6e3 100755
--- a/sbodl
+++ b/sbodl
@@ -177,7 +177,7 @@ CONTDISP="--content-disposition"
# 20231205 bkw: fancy argument checking. note that getopt is part of
# util-linux; do not confuse it with bash's built-in getopts (with an "s").
-OPTS=$( getopt -n 1.sh -o vmhafn -l help,man,doc,version,archive,force,no-content-disposition -- "$@" )
+OPTS=$( getopt -n $SELF -o vmhafnu -l help,man,doc,version,archive,force,no-content-disposition,update -- "$@" )
eval set -- "$OPTS"
while true; do
case "$1" in
@@ -186,6 +186,7 @@ while true; do
-v|--version) echo $VERSION ; exit 0 ;;
-a|--archive) USEARCHIVE="yes" ; shift ; continue ;;
-f|--force) FORCEDL="yes" ; shift ; continue ;;
+ -u|--update) UPDATE="yes" ; shift ; continue ;;
-n) CONTDISP="--no-content-disposition" ; shift ; continue ;;
--) shift; break ;;
esac
@@ -197,7 +198,8 @@ fi
[ -d "$CACHEDIR/" ] || mkdir -p $CACHEDIR || die "Can't create $CACHEDIR"
-source ./$( basename $( pwd ) ).info \
+INFOFILE="./$( basename $( pwd ) ).info"
+source "$INFOFILE" \
|| die "No .info file, are you sure this is a SBo directory? Try '$SELF --help'"
# This stanza copied from the SBo template for 14.1:
@@ -281,6 +283,10 @@ for dl in $DL; do
echo -e "${RED}WARN: md5sum doesn't match${COLOR_OFF}\\n expected: $1\\n got: $GOTSUM"
case "$FILE" in
?.cabal) echo -e "${YELLOW}HINT:${COLOR_OFF} for ?.cabal files: if the md5sum fails, retry with '$SELF -f'." ;;
+ *) if [ "$UPDATE" = "yes" ]; then
+ echo "Updating .info file with new md5sum"
+ sed -i "s,$1,$GOTSUM," $INFOFILE
+ fi ;;
esac
EXIT=1
else
@@ -294,3 +300,4 @@ for dl in $DL; do
done
exit $EXIT
+