From 408031a01d99e3b7c27d5767c5fd03730e6b37bd Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 19 Nov 2013 07:46:30 -0700 Subject: [PATCH] launcher: fix "extreg.rktd" in user's space Closes PR 14176 --- racket/collects/launcher/launcher.rkt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/racket/collects/launcher/launcher.rkt b/racket/collects/launcher/launcher.rkt index 775e69ec4d..88858f1aa8 100644 --- a/racket/collects/launcher/launcher.rkt +++ b/racket/collects/launcher/launcher.rkt @@ -460,18 +460,20 @@ "extreg.rktd" (path-element->string (file-name-from-path dest)) - (if (eq? (cdr im) 'main) - ;; make icon paths relative, if possible: - (for/list ([l (in-list (cdr m))]) - (for/list ([e (in-list l)] - [i (in-naturals)]) - (if (= i 3) + ;; make icon paths relative, if possible: + (for/list ([l (in-list (cdr m))]) + (for/list ([e (in-list l)] + [i (in-naturals)]) + (if (= i 3) + (if (eq? (cdr im) 'main) (let ([p (find-relative-path (find-lib-dir) e)]) (if (member 'up (explode-path p)) (path->bytes e) (path->bytes p))) - e))) - (cdr m))))) + (if (path? e) + (path->bytes e) + e)) + e)))))) ;; record Windows start-menu requests, if any (let ([m (assoc 'start-menu aux)]) (when (and m (cdr m))