From 6eef7054d2d0c38d24194b057e0ea4d5fbcd7ed7 Mon Sep 17 00:00:00 2001 From: "chess.griffin" Date: Sat, 29 Mar 2008 19:47:58 +0000 Subject: [PATCH] after discussions on IRC, I decided to change sbopkg.conf.sample back to simply a listing of variables without the option to pass environmental variables. I think exporting variables or some such complicates matters for this tool and it is really not needed. Also edited sbopkg.8 man page to remove references to environmental variables. --- src/etc/sbopkg/sbopkg.conf.sample | 12 ++++++------ src/usr/man/man8/sbopkg.8 | 27 ++++++++++++++------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/etc/sbopkg/sbopkg.conf.sample b/src/etc/sbopkg/sbopkg.conf.sample index 6190013..1397629 100644 --- a/src/etc/sbopkg/sbopkg.conf.sample +++ b/src/etc/sbopkg/sbopkg.conf.sample @@ -1,8 +1,8 @@ # $Id$ -RSYNCMIRROR=${RSYNCMIRROR:-slackbuilds.org::slackbuilds} -SLACKVER=${SLACKVER:-12.0} -LOCALREPO=${LOCALREPO:-/home/sbo} -SRCDIR=${SRCDIR:-/var/cache/sbopkg} -TMP=${TMP:-/tmp} -KEEPLOG=${KEEPLOG:-YES} +RSYNCMIRROR=slackbuilds.org::slackbuilds +SLACKVER=12.0 +LOCALREPO=/home/sbo +SRCDIR=/var/cache/sbopkg +TMP=/tmp +KEEPLOG=YES diff --git a/src/usr/man/man8/sbopkg.8 b/src/usr/man/man8/sbopkg.8 index 2e70d58..3d909a0 100644 --- a/src/usr/man/man8/sbopkg.8 +++ b/src/usr/man/man8/sbopkg.8 @@ -23,16 +23,19 @@ Sbopkg can be run from the command line by simply invoking "sbopkg." Doing so will launch the dialog-based interface, and the menus provided should be fairly explanatory. The main menu allows the user to rsync with the SlackBuilds.org repository, view the SlackBuilds.org -Changelog, display the contents of the local cache directory, and -browse the local copy of the SBo repository. Once the browse function -is chosen, the user can select the category of software to view. -After choosing a category, the user can then view the various software -packages available in the local SBo repository. Selecting a package -will display another menu allowing the user to view the package's -README, SlackBuild, .info, or slack-desc file. Additionally, if -sbopkg is run with root privileges, then the user can choose to build -a package as well. If KEEPLOG is set to YES in the sbopkg.conf file -then a permanent log of the build process is saved in +Changelog, display the contents of the local cache directory, display +the permanent build log, and browse the local copy of the SBo +repository. Once the browse function is chosen, the user can select +the category of software to view. After choosing a category, the user +can then view the various software packages available in the local SBo +repository. Selecting a package will display another menu allowing +the user to view the package's README, SlackBuild, .info, or +slack-desc file. The user can also edit the SlackBuild and the edited +SlackBuild will remain after doig an rsync. Additionally, if sbopkg +is run with root privileges, then the user can choose to build a +package as well using either the original SlackBuild or the +locally-edited one if present. If KEEPLOG is set to YES in the +sbopkg.conf file then a permanent log of the build process is saved in /tmp/sbopkg-build-log. Alternatively, sbopkg can be run from the command line without using @@ -53,9 +56,7 @@ local SBo repository .B -f Override the default configuration file, which is located by default at /etc/sbopkg/sbopkg.conf, with another configuration -file. Alternatively, the options contained in the configuration -file can be overridden by using command line options or custom -environmental variables. +file. .TP 5 .B -h