:: commit ba048be30c3555b2f24955f0841ddd3db8375f76

Kamila Szewczyk <kspalaiologos@gmail.com> — 2022-09-01 15:36

parents: a182db507e

remove bindir usage in scripts

diff --git a/.gitignore b/.gitignore
index 717b6e8..23a2c3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,4 @@ autom4te.cache/
 !/build-aux/ax_check_compile_flag.m4
 !/build-aux/ax_pthread.m4
 !/build-aux/git-version-gen
-
 bzip3.pc
-
-bz3cat
diff --git a/Makefile.am b/Makefile.am
index 8a3ae27..e652ea7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,9 +29,9 @@ bzip3_CFLAGS = $(AM_CFLAGS)
 bzip3_LDDADD = libbzip3.la
 bzip3_SOURCES = src/main.c $(libbzip3_la_SOURCES)
 
-dist_man_MANS = bzip3.1 bz3cat.1
+dist_man_MANS = bzip3.1 bz3cat.1 bz3more.1
 
-dist_bin_SCRIPTS = bz3cat
+dist_bin_SCRIPTS = bz3cat bz3more
 
 CLEANFILES = $(bin_PROGRAMS)
 
diff --git a/bz3cat b/bz3cat
new file mode 100644
index 0000000..e401222
--- /dev/null
+++ b/bz3cat
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec bzip3 -Bcd "$@"
diff --git a/bz3cat.in b/bz3cat.in
deleted file mode 100755
index 9f3c5d6..0000000
--- a/bz3cat.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-bindir=@bindir@
-case $1 in
---__bindir) bindir=${2?}; shift; shift;;
-esac
-PATH=$bindir:$PATH
-
-exec bzip3 -Bcd "$@"
diff --git a/bz3more b/bz3more
new file mode 100644
index 0000000..17f22c7
--- /dev/null
+++ b/bz3more
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+for FILE
+do
+  test $# -lt 2 ||
+    printf '::::::::::::::\n%s\n::::::::::::::\n' "$FILE" || break
+  bzip3 -Bcd -- "$FILE"
+done 2>&1 | eval ${PAGER-more}
diff --git a/bz3more.1 b/bz3more.1
new file mode 100644
index 0000000..63fc859
--- /dev/null
+++ b/bz3more.1
@@ -0,0 +1 @@
+.so man1/bzip3.1
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 67b8f44..4848d2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,6 @@ AM_COND_IF([PASSED_CFLAGS], [
 	])
 ])
 
-AC_CONFIG_FILES([Makefile bzip3.pc bz3cat])
+AC_CONFIG_FILES([Makefile bzip3.pc])
 AC_ARG_PROGRAM
 AC_OUTPUT
tab: 248 wrap: offon