suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "make user PLaneT install path use installation name instead of version""

Browse Source 
This reverts commit de230bc1ef.

Now that path computatons are built in, and now that the sandbox allows
reading the configuration file, using the installation name doesn't
break with sandboxing.
This commit is contained in:
Matthew Flatt 2013-08-19 14:56:21 -06:00
parent 220b284175
commit a4b994c3cb
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/racket-pkgs/racket-doc/planet/private/util.scrbl
View File

@ -9,7 +9,8 @@
planet/util
planet/version
planet/syntax
planet/scribble))
planet/scribble
setup/dirs))
@title{Utility Libraries}
@ -150,7 +151,7 @@ manually edit the @filepath{config.rkt} file.
@defparam[PLANET-DIR dir path-string?]{
The root of the version-specific PLaneT files.
Defaults to @racket[(build-path (PLANET-BASE-DIR) (version))].
Defaults to @racket[(build-path (PLANET-BASE-DIR) (get-installation-name))].
}
@defparam[CACHE-DIR dir path-string?]{
@ -206,7 +207,7 @@ The port on the server the client should connect to if
@defparam[HARD-LINK-FILE file path?]{
The name of the file where hard links are saved. Defaults to
@racket[(build-path (PLANET-BASE-DIR) (version) "HARD-LINKS")].
@racket[(build-path (PLANET-BASE-DIR) (get-installation-name) "HARD-LINKS")].
}
@defparam[PLANET-ARCHIVE-FILTER regexp-filter (or/c #f string? regexp?)]{
A regular-expression based filter that is used to skip files when building a @|PLaneT| archive.

7
racket/collects/planet/config.rkt
View File

@ -1,5 +1,6 @@
#lang racket/base
(require "private/define-config.rkt")
(require "private/define-config.rkt"
setup/dirs)
(define-parameters
(PLANET-SERVER-NAME "planet.racket-lang.org")
(PLANET-SERVER-PORT 270)
@ -10,11 +11,11 @@
(build-path (find-system-path 'addon-dir)
"planet"
(PLANET-CODE-VERSION)))))
(PLANET-DIR (build-path (PLANET-BASE-DIR) (version)))
(PLANET-DIR (build-path (PLANET-BASE-DIR) (get-installation-name)))
(CACHE-DIR (build-path (PLANET-DIR) "cache"))
(UNINSTALLED-PACKAGE-CACHE (build-path (PLANET-BASE-DIR) "packages"))
(LINKAGE-FILE (build-path (PLANET-DIR) "LINKAGE"))
(HARD-LINK-FILE (build-path (PLANET-BASE-DIR) (version) "HARD-LINKS"))
(HARD-LINK-FILE (build-path (PLANET-BASE-DIR) (get-installation-name) "HARD-LINKS"))
(LOG-FILE (build-path (PLANET-DIR) "INSTALL-LOG"))
(DEFAULT-PACKAGE-LANGUAGE (version))