From 98e6822b82821a648cbdfb6f7ddbaa48ca3a8d4d Mon Sep 17 00:00:00 2001 From: SANO Masatoshi Date: Sat, 24 Dec 2016 11:12:57 +0900 Subject: [PATCH] shorten --- lisp/init.ros | 6 +++--- lisp/locations.lisp | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lisp/init.ros b/lisp/init.ros index fd20dab..6d323b9 100644 --- a/lisp/init.ros +++ b/lisp/init.ros @@ -9,16 +9,16 @@ exec ros -Q -m roswell -L sbcl-bin -- $0 "$@" (ros:include "util")) (defpackage :ros.script.init.3672012201 - (:use :cl :ros)) + (:use :cl :ros :ros.util)) (in-package :ros.script.init.3672012201) (defun main (&optional name &rest r) (if name (let* ((date (get-universal-time)) (path - (or (probe-file (merge-pathnames (format nil "templates/~A/template.asd" name) (ros.util:homedir))) + (or (probe-file (merge-pathnames (format nil "templates/~A/template.asd" name) (homedir))) (unless (find #\/ name) - (let ((dir (directory (merge-pathnames (format nil "templates/*/~A/template.asd" name) (ros.util:homedir))))) + (let ((dir (directory (merge-pathnames (format nil "templates/*/~A/template.asd" name) (homedir))))) (cond ((>= (length dir) 2) (format *error-output* "ambiguous ~{~A~%~}" dir) diff --git a/lisp/locations.lisp b/lisp/locations.lisp index c7e451e..fce6f31 100644 --- a/lisp/locations.lisp +++ b/lisp/locations.lisp @@ -1,7 +1,3 @@ -(cl:in-package :cl-user) -(when (cl:find-package :ros.locations) - (pushnew :ros.locations *features*)) - (defpackage :ros.locations (:use :cl)) (in-package :ros.locations) @@ -48,5 +44,3 @@ (defuri sbcl-bin-uri) (defuri slime-uri "https://github.com/slime/slime.git") - -(push :ros.locations *features*)