diff options
| -rw-r--r-- | man1/sbocheck.1.bak~ | 32 | ||||
| -rw-r--r-- | slackbuild/sbotools/README | 6 | ||||
| -rw-r--r-- | slackbuild/sbotools/sbotools.SlackBuild | 6 | ||||
| -rwxr-xr-x | tools/update_man_pages.sh | 8 | ||||
| -rwxr-xr-x | tools/update_versions.sh | 1 |
5 files changed, 15 insertions, 38 deletions
diff --git a/man1/sbocheck.1.bak~ b/man1/sbocheck.1.bak~ deleted file mode 100644 index f0945e5..0000000 --- a/man1/sbocheck.1.bak~ +++ /dev/null @@ -1,32 +0,0 @@ -.TH sbocheck 1 "Sweetmorn, The Aftermath 39, 3179 YOLD" "sbotools 1.8" dawnrazor.net -.SH NAME -.P -sbocheck - update a local slackbuilds.org tree and check for updates. -.SH SYNAPSES -.P -sbocheck [-h|-v] -.SH DESCRIPTION -.P -sbocheck first updates a previously fetched copy of the slackbuilds.org tree (see sbosnap(1)) and then checks to see if any packages installed from slackbuilds.org have updates, and reports what it finds. -.SH OPTIONS -.P --h|--help -.RS -Show help information. -.RE -.P --v|--version -.RS -Show version information. -.RE -.SH BUGS -.P -None known, but there may be some. Please report any found to j@dawnrazor.net or xocel@iquidus.org; patches are always welcome. -.SH SEE ALSO -.P -sboclean(1), sboconfig(1), sbofind(1), sboinstall(1), sboremove(1), sbosnap(1), sboupgrade(1), sbotools.conf(5) -.SH AUTHORS -.P -Jacob Pipkin <j@dawnrazor.net> -.P -Luke Williams <xocel@iquidus.org> diff --git a/slackbuild/sbotools/README b/slackbuild/sbotools/README index 557db68..245f7dd 100644 --- a/slackbuild/sbotools/README +++ b/slackbuild/sbotools/README @@ -9,4 +9,10 @@ There are man pages for each of the sbo* commands, and more documentation, as well as online versions of the man pages, can be found at http://dawnrazor.net/sbotools/documentation/ +sbotools bundles the required Perl module Sort::Versions with it. This does +not interfere with a copy installed from the CPAN, or from slackbuilds.org. + +sbotools is written and maintained by d4wnr4z0r, xocel, and pink_mist; +we can be contacted in #sbotools on freenode. + http://dawnrazor.net/sbotools diff --git a/slackbuild/sbotools/sbotools.SlackBuild b/slackbuild/sbotools/sbotools.SlackBuild index fe18684..5295a8e 100644 --- a/slackbuild/sbotools/sbotools.SlackBuild +++ b/slackbuild/sbotools/sbotools.SlackBuild @@ -31,12 +31,16 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o \ -perm 400 \) -exec chmod 644 {} \; +# we set INSTALLMAN3DIR=none to elide the Sort::Versions.3 man page so that we +# don't clobber one from perl-Sort-Versions or Sort::Versions. ( cd SBO-Lib perl Makefile.PL \ PREFIX=/usr \ INSTALLDIRS=site \ INSTALLVENDORMAN1DIR=/usr/man/man1 \ - INSTALLVENDORMAN3DIR=/usr/man/man3 + INSTALLMAN3DIR=/usr/man/man3 \ + INSTALLVENDORMAN3DIR=/usr/man/man3 \ + INSTALLMAN3DIR=none make make test make install DESTDIR=$PKG diff --git a/tools/update_man_pages.sh b/tools/update_man_pages.sh index 6a57b4c..fe96125 100755 --- a/tools/update_man_pages.sh +++ b/tools/update_man_pages.sh @@ -78,12 +78,12 @@ update_date() { new_date=$(ddate +"%{%A, %B %d%}, %Y YOLD") - for i in $(ls man1); do - sed_file man1/$i "s/$old_date/$new_date/g" + for i in man1/*; do + sed_file $i "s/$old_date/$new_date/g" done - for i in $(ls man5); do - sed_file man5/$i "s/$old_date/$new_date/g" + for i in man5/*; do + sed_file $i "s/$old_date/$new_date/g" done if [[ "$?" == "0" ]]; then diff --git a/tools/update_versions.sh b/tools/update_versions.sh index 493a3fb..50e9464 100755 --- a/tools/update_versions.sh +++ b/tools/update_versions.sh @@ -28,7 +28,6 @@ update=" old_version=$(grep '^our $VERSION' SBO-Lib/lib/SBO/Lib.pm \ | grep -Eo '[0-9]+(\.[0-9]+){0,1}') -echo $old_version tmpfile=$(mktemp /tmp/XXXXXXXXXX) |