emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New configuration schemas changes, round 3.

Browse Source 
struct xbps_handle::conffile has been renamed to confdir, and it now
expects the path to a directory, where the configuration files are
stored.

Change xbps-bin(8) and xbps-repo(8) along with its manpages to mention
that -C expects a directory.
This commit is contained in:
Juan RP
2011-10-17 15:11:54 +02:00
parent c285afebdc
commit 931a03b806
9 changed files with 94 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/xbps-bin/main.c
View File

@@ -185,12 +185,12 @@ main(int argc, char **argv)
struct xferstat xfer;
struct list_pkgver_cb lpc;
struct sigaction sa;
const char *rootdir, *cachedir, *conffile;
const char *rootdir, *cachedir, *confdir;
int i , c, flags, rv;
bool yes, purge, debug, force_rm_with_deps, recursive_rm;
bool install_auto, install_manual, show_download_pkglist_url;
rootdir = cachedir = conffile = NULL;
rootdir = cachedir = confdir = NULL;
flags = rv = 0;
yes = purge = force_rm_with_deps = recursive_rm = debug = false;
install_auto = install_manual = show_download_pkglist_url = false;
@@ -201,7 +201,7 @@ main(int argc, char **argv)
install_auto = true;
break;
case 'C':
conffile = optarg;
confdir = optarg;
break;
case 'c':
cachedir = optarg;
@@ -290,8 +290,8 @@ main(int argc, char **argv)
xhp->rootdir = prop_string_create_cstring(rootdir);
if (cachedir)
xhp->cachedir = prop_string_create_cstring(cachedir);
if (conffile)
xhp->conffile = prop_string_create_cstring(conffile);
if (confdir)
xhp->confdir = prop_string_create_cstring(confdir);
xhp->flags = flags;
xhp->install_reason_manual = install_manual;

15
bin/xbps-bin/xbps-bin.8
View File

@@ -1,4 +1,4 @@
.TH "XBPS\-BIN" "8" "07/28/2011" "\ \&" "\ \&"
.TH "XBPS\-BIN" "8" "17/10/2011" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -28,9 +28,10 @@ Use of this option takes effect in the \fIautoupdate\fR, \fIinstall\fR and
matched.
.RE
.PP
\fB\-C\fR \fIconffile\fR
\fB\-C\fR \fIconfdir\fR
.RS 4
Full path to the \fIxbps-conf.plist\fR plist configuration file.
Full path to the XBPS configuration directory where the configuration files are available\&.
By default it\(cqs set to \fIETCDIR/xbps\fR\&.
.RE
.PP
\fB\-c\fR \fIcachedir\fR
@@ -287,6 +288,7 @@ The package is fully installed, that means it was unpacked and configured correc
.RE
.PP
\fBhalf\-unpacked\fR
.RS 4
The package was being unpacked but didn't finish properly for unknown reasons.
.RE
.PP
@@ -302,11 +304,16 @@ The package has been removed but configuration files and its metadata directory
.PP
.SH "FILES"
.PP
\fB/etc/xbps-conf.plist\fR
\fB/etc/xbps/conf.plist\fR
.RS 4
Default XBPS configuration file\&.
.RE
.PP
\fB/etc/xbps/repositories.plist\fR
.RS 4
Defaults XBPS repositories configuration file\&.
.RE
.PP
\fB/var/db/xbps\fR
.RS 4
xbps global metadata directory\&.