mirrors/sbopkg
2
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-11-10 03:50:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added a '?' argument to the -V flag and modified manpage and help output

Browse Source 
This allows the user to invoke sbopkg with '-V ?' to get a list of valid
repo/branches and allows us to suggest that in the manpage and help output.
This was we don't have to keep up with manually itemizing the valid options.
Part of this change pops out a pre-existing block of code and turns it into
list_repos().
This commit is contained in:
slakmagik 2010-05-19 16:02:51 +00:00
parent ebc21b98a0
commit 29f3ec72eb
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/usr/man/man8/sbopkg.8
View File

@ -228,13 +228,11 @@ will search for foo and then bar.
Check for an update to sbopkg itself and then quit.
.TP 5
.B -V VERSION
.B -V REPO/BRANCH
Set the repository and branch to use.
The currently supported repositories are SBo and local. Inside these,
the supported branches are 11.0, 12.0, 12.1, 12.2, 13.0, and 13.1 for
SBo and local for local. The Slamd64Builds repository is 'master'
but is not officially supported.
For a list of valid versions, invoke sbopkg as
.BR "sbopkg -V ?" .
See the
.B sbopkg.conf (5)
man page for more information about the 'local' repository.

30
src/usr/sbin/sbopkg
View File

@ -1008,6 +1008,14 @@ set_repo_vars() {
return 1
}
list_repos() {
echo "Valid options are:" >&2
for ((i=0; i<${#REPOSITORIES[@]}; i+=$REPOS_FIELDS)); do
echo -en "${REPOSITORIES[$i]}/${REPOSITORIES[(($i + 1))]}\\t" >&2
echo "(${REPOSITORIES[(($i + 2))]})" >&2
done
}
select_repository() {
# Create menu and list the sbopkg-supported repositories for
# user to choose from.
@ -4494,14 +4502,10 @@ Options are:
display package information.
-u Check for an update to sbopkg.
-v Print sbopkg's version on stdout.
-V repo/branch Set the repository/branch (e.g. "-v SBo/13.0").
If the repository name is not specified, sbopkg will first
try with the default one. If no match is found, sbopkg will
look for the first matching branch of any repository.
The default valid choices are SBo/{11.0,12.0,12.1,12.2,13.0}
for the SlackBuilds.org repository, SB64/master for the
builds.Slamd64.com repository and local/local for the local
repository).
-V repo/branch Set the repository/branch. The repo is optional and, if
not given, sbopkg will try to make the best match,
starting with the default repo. For a list of valid repos,
issue '-V ?'
Note: multiple arguments to -b, -g, -i, and -s must be quoted ("pkg1 pkg2")
EOF
@ -4544,6 +4548,10 @@ TMPSUMMARYLOG=$SBOPKGTMP/sbopkg-tmp-summarylog
# Change $REPO_BRANCH (and optionally REPO_NAME) if set manually using cli -v
if [[ $VERSION ]]; then
if [[ $CUSTOMVER == ? ]]; then
list_repos
exit 0
fi
if [[ $CUSTOMVER =~ .*/.* ]]; then
# The user specified repository/branch
eval $(sed 's:^\(.*\)/\(.*\)$:REPO_NAME=\1;REPO_BRANCH=\2:g' \
@ -4561,11 +4569,7 @@ fi
set_repo_vars
if [[ $? -ne 0 ]] ; then
echo "Unknown repository name -- \"$CUSTOMVER\"" >&2
echo "Valid options are:" >&2
for ((i=0; i<${#REPOSITORIES[@]}; i+=$REPOS_FIELDS)); do
echo -en "${REPOSITORIES[$i]}/${REPOSITORIES[(($i + 1))]}\\t" >&2
echo "(${REPOSITORIES[(($i + 2))]})" >&2
done
list_repos
exit 1
fi