Handle relative selectors.

[scratchy.git] / scratchy.scm

diff --git a/scratchy.scm b/scratchy.scm
index cd4fa8e..12c7094 100644 (file)
--- a/scratchy.scm
+++ b/scratchy.scm
@@ -20,7 +20,7 @@
 
 ;;; Global constants
 
-(define scratchy-version "1.3.0")
+(define scratchy-version "1.4.1")
 
 (define scratchy-footer
   (conc "\n"
@@ -234,7 +234,7 @@
     (if (legal-script-filename? filename config)
         (let* ((sexp (with-input-from-file filename read))
                (script-result (with-selector-dir
-                               selector config
+                               (pathname-directory selector) config
                                (lambda ()
                                  (apply (eval sexp) arguments)))))
           (when (pair? script-result)
@@ -280,7 +280,7 @@
                    dir-selector config))
     ((type display-string selector)
      (serve-record (list type display-string
-                         (make-pathname dir-selector selector)
+                         (normalize-pathname (make-pathname dir-selector selector))
                          (config-host config) (config-port config))
                    dir-selector config))
     ((display-string selector)
@@ -350,9 +350,9 @@
 (define (main)
   (let* ((progname (pathname-file (car (argv))))
          (config (make-config '() '() 70 #t '() '() '() '())))
-    (if (null? (cdr (argv)))
+    (if (null? (command-line-arguments))
         (print-usage progname)
-        (let loop ((args (cdr (argv))))
+        (let loop ((args (command-line-arguments)))
           (let ((this-arg (car args))
                 (rest-args (cdr args)))
             (if (string-prefix? "-" this-arg)