From ada99a84711457a2035870f8c1155c81e9819ea4 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Mon, 22 Jun 2015 23:39:51 +0200 Subject: [PATCH 1/5] link the wiki in the Readme --- README | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README b/README index 9628e19..4987382 100644 --- a/README +++ b/README @@ -36,7 +36,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 ========================================================== From 560138c02b27ad29a0aa089b204ebcb216f2a553 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Mon, 22 Jun 2015 23:40:07 +0200 Subject: [PATCH 2/5] readme: only sudo make install on successful make --- README | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README b/README index 4987382..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 From 4d7e02e7c5dfd67b7281a24c6aa71284f6d4402f Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Mon, 22 Jun 2015 23:41:14 +0200 Subject: [PATCH 3/5] docs/quickstart: use repository shift-reset --- docs/quickstart.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From d364a497fdf298c9c9c69773096383905eff2e6e Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Tue, 23 Feb 2016 23:49:17 +0100 Subject: [PATCH 4/5] starting to implement showing the install path in show. --- Makefile.am | 1 + scripts/show.scm | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) 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/scripts/show.scm b/scripts/show.scm index b1c8320..6bfa158 100644 --- a/scripts/show.scm +++ b/scripts/show.scm @@ -33,6 +33,9 @@ #: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 inventory) #:use-module (guildhall ui formatters)) (define %summary "Show package information.") @@ -48,9 +51,17 @@ --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"))) + (cat "Status: " (database-item-state item) "\n") + (cat "Path: " (let ((lib (package-category-inventory (database-item-package item) 'libraries))) + (if (not lib) #f + lib)) ; TODO: lib is a zipper datastructure. Extract the paths. Then search the load-path. See spells/zipper-tree.scm + "\n"))) (define (parse-package-string s) (cond ((maybe-string->package s "=") From 761e474ada6d3de797d2602941b595498918d348 Mon Sep 17 00:00:00 2001 From: "drak@kav" Date: Sun, 20 Mar 2016 21:45:06 +0100 Subject: [PATCH 5/5] show: add footer with information about destinations --- scripts/show.scm | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/scripts/show.scm b/scripts/show.scm index 6bfa158..db589db 100644 --- a/scripts/show.scm +++ b/scripts/show.scm @@ -35,6 +35,7 @@ #: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)) @@ -57,11 +58,7 @@ (define (dsp-db-item item) (dsp-package (database-item-package item) - (cat "Status: " (database-item-state item) "\n") - (cat "Path: " (let ((lib (package-category-inventory (database-item-package item) 'libraries))) - (if (not lib) #f - lib)) ; TODO: lib is a zipper datastructure. Extract the paths. Then search the load-path. See spells/zipper-tree.scm - "\n"))) + (cat "Status: " (database-item-state item) "\n"))) (define (parse-package-string s) (cond ((maybe-string->package s "=") @@ -83,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 '()) @@ -96,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))