Hello,

Attached you can find some patches for chicken-install and
documentation for egg management tools.

They are probably trivial.  If they look ok and you want me to push
directly, just drop me a note.

All the best.
Mario
-- 
http://parenteses.org/mario
>From de31aeb48b899dc97311236ca257ac97f697af21 Mon Sep 17 00:00:00 2001
From: Mario Domenech Goulart <ma...@parenteses.org>
Date: Sun, 23 Apr 2017 19:42:54 +0200
Subject: [PATCH 1/6] manual/Extensions: update documentation for
 chicken-install command line options

- Remove -location and -transport (not implemented in the code)
- Document -no-install-deps and -purge
- Sort options according to the order displayed by chicken-install -h
---
 manual/Extensions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manual/Extensions b/manual/Extensions
index 679bfd9..8c074ac 100644
--- a/manual/Extensions
+++ b/manual/Extensions
@@ -565,14 +565,14 @@ Available options:
 ; {{-version}} : show version and exit
 ; {{-force}} : don't ask, install even if versions don't match
 ; {{-k   -keep}} : keep temporary files
-; {{-l   -location LOCATION}} : install from given location instead of default
-; {{-t   -transport TRANSPORT}} : use given transport instead of default
-; {{-list-versions}} : list available version for an extension
 ; {{-s   -sudo}} : use external command to elevate privileges when installing or removing files
+; {{-no-install-deps}} : do not install dependencies
 ; {{-r   -retrieve}} : only retrieve egg into current directory, don't install (giving -r more than once implies {{-recursive}})
 ; {{-recursive}} : if {{-retrieve}} is given, retrieve also dependencies
 ; {{-dry-run}} :  do not build or install, just print the locations of the generated build + install scripts
+; {{-list-versions}} : list available version for an extension
 ; {{-n   -no-install}} : do not install, only build the egg.
+; {{-purge}} : remove cached files for given eggs (or purge cache completely)
 ; {{-host}} : when cross-compiling, compile egg for host only
 ; {{-target}} : when cross-compiling, compile egg for target only
 ; {{-test}} : run included test-cases, if available
-- 
2.1.4

>From 4c5d42197148c66afab24239033d6f164fc916b1 Mon Sep 17 00:00:00 2001
From: Mario Domenech Goulart <ma...@parenteses.org>
Date: Sun, 23 Apr 2017 19:43:40 +0200
Subject: [PATCH 2/6] chicken-install: document -v and add long option for it

-v was the only option without a long counterpart, so add -verbose.
---
 chicken-install.scm | 3 ++-
 manual/Extensions   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/chicken-install.scm b/chicken-install.scm
index d3d7558..8d8c051 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -1017,6 +1017,7 @@ usage: chicken-install [OPTION | EXTENSION[:VERSION]] ...
   -u   -update-db               update export database
        -repository              print path used for egg installation
        -override FILENAME       override versions for installed eggs with information from file
+  -v   -verbose                 be verbose
 
 chicken-install recognizes the SUDO, http_proxy and proxy_auth environment variables, if set.
 
@@ -1078,7 +1079,7 @@ EOF
                   ((equal? arg "-dry-run")
                    (set! do-not-build #t)
                    (loop (cdr args)))
-                  ((equal? arg "-v")
+                  ((member arg '("-v" "-verbose"))
                    (set! quiet #f)
                    (loop (cdr args)))
                   ((member arg '("-k" "-keep"))
diff --git a/manual/Extensions b/manual/Extensions
index 8c074ac..7025822 100644
--- a/manual/Extensions
+++ b/manual/Extensions
@@ -579,6 +579,7 @@ Available options:
 ; {{-u   -update-db}} : update export database
 ; {{-repository}} : print path to egg repository
 ; {{-override FILENAME}} : override versions for installed eggs with information given in {{FILENAME}}, which can be generated by {{-scan}} or by the {{-list}} option of the {{chicken-status}} program
+; {{-v   -verbose}} : be verbose
 
 {{chicken-install}} recognizes the {{SUDO}}, {{http_proxy}} and {{proxy_auth}} environment variables, if set.
 
-- 
2.1.4

>From 8c86b8958025f94dcccaa74df37973e70eda2b9d Mon Sep 17 00:00:00 2001
From: Mario Domenech Goulart <ma...@parenteses.org>
Date: Sun, 23 Apr 2017 19:47:05 +0200
Subject: [PATCH 3/6] manual/Extensions: update documentation for
 chicken-uninstall command line options

- Remove -prefix (not implemented in the code)
- Sort options according to the order displayed by chicken-uninstall -h
---
 manual/Extensions | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manual/Extensions b/manual/Extensions
index 7025822..dbf446d 100644
--- a/manual/Extensions
+++ b/manual/Extensions
@@ -589,11 +589,10 @@ Available options:
 ; {{-h   -help}} : show usage information and exit
 ; {{-version}} : show version and exit
 ; {{-force}} : don't ask, delete whatever matches
+; {{-match}} : treat egg-names as glob patterns
 ; {{-s   -sudo}} : use external command to elevate privileges for deleting files
-; {{-p   -prefix PREFIX}} : change installation prefix to {{PREFIX}}
 ; {{-host}} : when cross-compiling, remove eggs for host system only
 ; {{-target}} : when cross-compiling, remove eggs for target system only
-; {{-match}} : treat egg-names as glob patterns
 
 === chicken-status reference
 
-- 
2.1.4

>From a67cd3b14ff9182304c1aa40fea4cfd1ffc8183c Mon Sep 17 00:00:00 2001
From: Mario Domenech Goulart <ma...@parenteses.org>
Date: Sun, 23 Apr 2017 19:50:12 +0200
Subject: [PATCH 4/6] manual/Extensions: update documentation for
 chicken-status command line options

- Remove -prefix (not implemented in the code)
- Sort options according to the order displayed by chicken-status -h
- Document -components
---
 manual/Extensions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manual/Extensions b/manual/Extensions
index dbf446d..f9592dd 100644
--- a/manual/Extensions
+++ b/manual/Extensions
@@ -598,13 +598,13 @@ Available options:
 
 ; {{-h   -help}} : show usage information and exit
 ; {{-version}} : show version and exit
-; {{-f   -files}} : list installed files
 ; {{-a   -all}} : Scan all repositories in {{CHICKEN_REPOSITORY_PATH}}
+; {{-f   -files}} : list installed files
+; {{-match}} : treat egg-names as glob patterns
 ; {{-host}} : when cross-compiling, show eggs for host system only
 ; {{-target}} : when cross-compiling, show eggs for target system only
-; {{-p   -prefix PREFIX}} : change installation prefix to {{PREFIX}}
-; {{-match}} : treat egg-names as glob patterns
 ; {{-list}} : list installed egg version in format suitable for {{chicken-install -override}}
+; {{-c   -components}} : list installed components
 
 
 === Security
-- 
2.1.4

>From 9fdb8be6e02a8d0a90bef0c5d75683a07a191399 Mon Sep 17 00:00:00 2001
From: Mario Domenech Goulart <ma...@parenteses.org>
Date: Sun, 23 Apr 2017 19:55:52 +0200
Subject: [PATCH 5/6] chicken-install: add note to docs about -list-version
 being for HTTP transport only

---
 chicken-install.scm | 2 +-
 manual/Extensions   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chicken-install.scm b/chicken-install.scm
index 8d8c051..541bc5c 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -1008,7 +1008,7 @@ usage: chicken-install [OPTION | EXTENSION[:VERSION]] ...
        -recursive               if `-retrieve' is given, retrieve also dependencies
        -dry-run                 do not build or install, just print the locations of the generated
                                 build + install scripts
-       -list-versions           list available versions for given eggs
+       -list-versions           list available versions for given eggs (HTTP transport only)
   -n   -no-install              do not install, just build
        -purge                   remove cached files for given eggs (or purge cache completely)
        -host                    when cross-compiling, compile extension only for host
diff --git a/manual/Extensions b/manual/Extensions
index f9592dd..9ece18b 100644
--- a/manual/Extensions
+++ b/manual/Extensions
@@ -570,7 +570,7 @@ Available options:
 ; {{-r   -retrieve}} : only retrieve egg into current directory, don't install (giving -r more than once implies {{-recursive}})
 ; {{-recursive}} : if {{-retrieve}} is given, retrieve also dependencies
 ; {{-dry-run}} :  do not build or install, just print the locations of the generated build + install scripts
-; {{-list-versions}} : list available version for an extension
+; {{-list-versions}} : list available version for an extension (HTTP transport only)
 ; {{-n   -no-install}} : do not install, only build the egg.
 ; {{-purge}} : remove cached files for given eggs (or purge cache completely)
 ; {{-host}} : when cross-compiling, compile egg for host only
-- 
2.1.4

>From 4fb718fca86810db495ed4b4df5480f3fce4bad1 Mon Sep 17 00:00:00 2001
From: Mario Domenech Goulart <ma...@parenteses.org>
Date: Sun, 23 Apr 2017 20:05:29 +0200
Subject: [PATCH 6/6] chicken-install: update list of short options

Also sort them according to the order printed by chicken-install -h.
---
 chicken-install.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chicken-install.scm b/chicken-install.scm
index 541bc5c..ffc3bac 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -46,7 +46,7 @@
 (define +defaults-version+ 2)
 (define +module-db+ "modules.db")
 (define +defaults-file+ "setup.defaults")
-(define +short-options+ '(#\r #\h #\n #\k))
+(define +short-options+ '(#\h #\k #\s #\r #\n #\u #\v))
 (define +one-hour+ (* 60 60))
 (define +timestamp-file+ "TIMESTAMP")
 (define +status-file+ "STATUS")
-- 
2.1.4

_______________________________________________
Chicken-hackers mailing list
Chicken-hackers@nongnu.org
https://lists.nongnu.org/mailman/listinfo/chicken-hackers

Reply via email to