diff --git a/Makefile.am b/Makefile.am index 0b29883..01f95f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -81,6 +81,7 @@ SOURCES = \ scripts/config.scm \ scripts/create-bundle.scm \ scripts/list-packages.scm \ + scripts/hall.scm \ scripts/install.scm \ scripts/reinstall.scm \ scripts/remove.scm \ diff --git a/README b/README index 9628e19..1a944fa 100644 --- a/README +++ b/README @@ -19,8 +19,7 @@ Then get and install guildhall: git clone git@github.com/ijp/guildhall.git cd guildhall - ./autogen.sh && ./configure --prefix /usr && make - sudo make install + ./autogen.sh && ./configure --prefix /usr && make && sudo make install Finally add a minimal configuration @@ -36,7 +35,9 @@ More options: guild --help -For details see docs/installation.texi and docs/quickstart.texi +For details see docs/installation.texi and docs/quickstart.texi as well as the wiki: + +https://github.com/ijp/guildhall/wiki/Getting-Started === Background ========================================================== diff --git a/docs/quickstart.texi b/docs/quickstart.texi index e8159d2..af0442b 100644 --- a/docs/quickstart.texi +++ b/docs/quickstart.texi @@ -12,7 +12,7 @@ Guildhall where it can find software (@pxref{Packages}) to install. Create the file @file{~/.config/guildhall/config.scm} and add this line: @lisp -(repository experimental "http://rotty.yi.org/doro/experimental") +(repository shift-reset "http://shift-reset.com/doro/") @end lisp This tells Guildhall the location of the Andreas Rottmann's diff --git a/scripts/show.scm b/scripts/show.scm index b1c8320..db589db 100644 --- a/scripts/show.scm +++ b/scripts/show.scm @@ -33,6 +33,10 @@ #:use-module (guildhall private utils) #:use-module (guildhall database) #:use-module (guildhall package) + #:use-module (guildhall destination fhs) + #:use-module (guildhall destination) + #:use-module (guildhall spells pathname) + #:use-module (guildhall inventory) #:use-module (guildhall ui formatters)) (define %summary "Show package information.") @@ -48,6 +52,10 @@ --version Print version information. ") +(define (search-load-path item) + %load-path) + + (define (dsp-db-item item) (dsp-package (database-item-package item) (cat "Status: " (database-item-state item) "\n"))) @@ -72,6 +80,13 @@ (database-items db name))))))) => (reverse result))) +(define (directory-string db category) + (directory-namestring + (destination-pathname + ((@@ (guildhall database) database-destination) db) + (make-package 'PKG '((0))) + category "module.scm"))) + (define %mod (current-module)) (define (main . args) (define bundles '()) @@ -85,5 +100,13 @@ (database-add-bundles! db bundles) (fmt #t (fmt-join dsp-db-item (find-db-items db packages) - "\n")))) + "\n")) + (fmt #t (cat "\nDestinations:\n" + (fmt-join + (lambda (category) + (cat " - " (symbol->string category) ": /" + (directory-string db category))) + '(libraries executables documentation) + "\n") + "\n")))) (exit 0))