From a4b994c3cb1f52a1c08906790e3bcecd9a4f5dc3 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 19 Aug 2013 14:56:21 -0600 Subject: [PATCH] Revert "Revert "make user PLaneT install path use installation name instead of version"" This reverts commit de230bc1efcf02e29827241bdb53fc571e7072e8. 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. --- pkgs/racket-pkgs/racket-doc/planet/private/util.scrbl | 7 ++++--- racket/collects/planet/config.rkt | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/racket-pkgs/racket-doc/planet/private/util.scrbl b/pkgs/racket-pkgs/racket-doc/planet/private/util.scrbl index e9f1f2d72c..276f6c3c29 100644 --- a/pkgs/racket-pkgs/racket-doc/planet/private/util.scrbl +++ b/pkgs/racket-pkgs/racket-doc/planet/private/util.scrbl @@ -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. diff --git a/racket/collects/planet/config.rkt b/racket/collects/planet/config.rkt index 8ce76909f1..e25aa01f7e 100644 --- a/racket/collects/planet/config.rkt +++ b/racket/collects/planet/config.rkt @@ -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))