install zpm directory at install time

diff --git a/Makefile b/Makefile
index 244521b911363db9894b467f46d14e1c8846d0ad..969127610e1ff39b276402801a4c1a841a301516 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -208,6 +208,8 @@ libelf.a: elf/libelf.o
 
 install: $(COMPILED) $(MANPAGES)
        test -d $(DESTDIR)/sbin || install -d $(DESTDIR)/sbin
 
 install: $(COMPILED) $(MANPAGES)
        test -d $(DESTDIR)/sbin || install -d $(DESTDIR)/sbin

+       test -d $(DESTDIR)/var/lib/zpm || install -d $(DESTDIR)/var/lib/zpm
+       test -d $(DESTDIR)/var/lib/zpm/packages || install -d $(DESTDIR)/var/lib/zpm/packages

        install $(PROGRAMS) $(DESTDIR)/sbin
        mkdir -p $(DESTDIR)/usr/share/man/man8
        install -m644 $(MANPAGES) $(DESTDIR)/usr/share/man/man8
        install $(PROGRAMS) $(DESTDIR)/sbin
        mkdir -p $(DESTDIR)/usr/share/man/man8
        install -m644 $(MANPAGES) $(DESTDIR)/usr/share/man/man8

diff --git a/doc/zpm-update.8 b/doc/zpm-update.8
index c25751e03edb8581bbdd43f93659672431d198b6..90e6929e6c2eee504543f7e15406ce3859fd7091 100644 (file)
--- a/doc/zpm-update.8
+++ b/doc/zpm-update.8
@@ -1,4 +1,4 @@
-.TH zpm-update 8 2019-02-16 "ZPM 0.4"
+.TH zpm-update 8 2019-02-19 "ZPM 0.4"

 .SH NAME
 zpm-update \- update set of installed packages
 .SH SYNOPSIS
 .SH NAME
 zpm-update \- update set of installed packages
 .SH SYNOPSIS


@@ -49,53 +49,53 @@ in /var/lib/zpm/*.repo /var/lib/zpm/packages/*.zpm and the usual
 location for the local database.
 .SH OPTIONS
 .TP
 location for the local database.
 .SH OPTIONS
 .TP

-\-f
+.B \-f

 specify the package file to find packages in
 .TP
 specify the package file to find packages in
 .TP

-\-n
+.B \-n

 perform a dry run.  This option calls zpm-syncfs in dry-run mode,
 and doesn't run any package scripts.  Since scripts aren't run
 and no files are changed, this can only detect and report some
 types of errors.
 .TP
 perform a dry run.  This option calls zpm-syncfs in dry-run mode,
 and doesn't run any package scripts.  Since scripts aren't run
 and no files are changed, this can only detect and report some
 types of errors.
 .TP

-\-l
+.B \-l

 Just list the computed set of packages to update.
 .TP
 Just list the computed set of packages to update.
 .TP

-\-R \fIrootdir\fR
+.BI \-R rootdir

 Specify a root directory for the package installs.  Files will be
 installed relative to this directory.
 .TP
 Specify a root directory for the package installs.  Files will be
 installed relative to this directory.
 .TP

-\-S
+.B \-S

 Don't run any package pre or post scripts.  Normally zpm-update will run
 package pre and post scripts associated with packages being removed, updated,
 or installed.  See zpm-script(8) for details.  If any scripts are skipped due
 to the option, a note will be added.
 .TP
 Don't run any package pre or post scripts.  Normally zpm-update will run
 package pre and post scripts associated with packages being removed, updated,
 or installed.  See zpm-script(8) for details.  If any scripts are skipped due
 to the option, a note will be added.
 .TP

-\-C
+.B \-C

 Don't run package configure scripts.  Any skipped scripts will have a note
 added.
 .TP
 Don't run package configure scripts.  Any skipped scripts will have a note
 added.
 .TP

-\-v
+.B \-v

 Run syncfs in verbose mode.  This flag is passed on to zpm-syncfs.
 .TP
 Run syncfs in verbose mode.  This flag is passed on to zpm-syncfs.
 .TP

-\-p
+.B \-p

 Passed to zpm-syncfs to control the type of progress meter.
 .TP
 Passed to zpm-syncfs to control the type of progress meter.
 .TP

-\-z
+.B \-z

 Don't pull remote repositories before searching for packages, by
 default all remote repos are refreshed with repo pull before
 commencing a search for new packages.
 .TP
 Don't pull remote repositories before searching for packages, by
 default all remote repos are refreshed with repo pull before
 commencing a search for new packages.
 .TP

-\-L
+.B \-L

 Don't check for library dependencies, passed on to zpm-search.
 .TP
 Don't check for library dependencies, passed on to zpm-search.
 .TP

-\-A
+.B \-A

 run zpm-syncfs in accept mode
 .TP
 run zpm-syncfs in accept mode
 .TP

-\-O
+.B \-O

 run zpm-syncfs in overwrite mode mode
 .TP
 run zpm-syncfs in overwrite mode mode
 .TP

-\-U
+.B \-U

 Treat unmarked packages as packages to be uninstalled.
 .SH EXAMPLES
 .TP
 Treat unmarked packages as packages to be uninstalled.
 .SH EXAMPLES
 .TP

diff --git a/src/search.c b/src/search.c
index dd324d55a7d1664d0006b283a6f5a6aab292bbd7..fd8d793fce6c1711b273deaa7065989dd3c69162 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -459,7 +459,6 @@ int main(int ac, char *av[]) {
        opt.repodir = getenv("ZPM_REPO_DIR");
        if (!opt.repodir) opt.repodir = "/var/lib/zpm/repo";
 
        opt.repodir = getenv("ZPM_REPO_DIR");
        if (!opt.repodir) opt.repodir = "/var/lib/zpm/repo";
 

-

        /* -l also find packages needed for libs
         * -j output json
         *  -q quiet - suppress output
        /* -l also find packages needed for libs
         * -j output json
         *  -q quiet - suppress output