ros.util -> roswell.util

lisp/asdf.ros

@@ -11,7 +11,7 @@ exec ros -Q -m roswell -L sbcl-bin -- $0 "$@"
     (ql:quickload '(:plump) :silent t)))
 
 (defpackage :ros.script.asdf.3672011844
-  (:use :cl :ros.util :roswell.locations :roswell.install))
+  (:use :cl :roswell.util :roswell.locations :roswell.install))
 (in-package :ros.script.asdf.3672011844)
 
 (defun asdf-get-version ()

lisp/delete.ros

@@ -11,7 +11,7 @@ exec ros -Q -m roswell -L sbcl-bin -- $0 "$@"
     (ql:quickload :uiop :silent t)))
 
 (defpackage :ros.script.delete.3672011943
-  (:use :cl :ros.util))
+  (:use :cl :roswell.util))
 (in-package :ros.script.delete.3672011943)
 
 (defun delete-dump (params)

lisp/dump.ros

@@ -11,7 +11,7 @@ exec ros -- $0 "$@"
     #+quicklisp(ql:quickload :uiop :silent t)))
 
 (defpackage :ros.script.dump.3672012101
-  (:use :cl :ros.util))
+  (:use :cl :roswell.util))
 (in-package :ros.script.dump.3672012101)
 
 (defun dump-dir ()
@@ -242,8 +242,8 @@ exec ros -- $0 "$@"
                (setf ros:*argv*
                      (eval
                       (read-from-string
-                       "(loop :for i :from 0 :below (ext:argc)
-                             :collect (ext:argv i))")))
+                       "(loop for i from 0 below (ext:argc)
+                             collect (ext:argv i))")))
                (print ros:*argv*)
                (ros:run ',cmds)))))
       ;; (uiop:run-program (format nil "rm -r ~a" tmp))

lisp/help.ros

@@ -8,7 +8,7 @@ exec ros -Q -m roswell -L sbcl-bin -- $0 "$@"
   (ros:include "util"))
 
 (defpackage :ros.script.help.3668211011
-  (:use :cl :ros.util))
+  (:use :cl :roswell.util))
 (in-package :ros.script.help.3668211011)
 
 (defvar *options*

lisp/init.ros

@@ -9,7 +9,7 @@ exec ros -Q -m roswell -L sbcl-bin -- $0 "$@"
   (ros:include "util"))
 
 (defpackage :ros.script.init.3672012201
-  (:use :cl :ros :ros.util))
+  (:use :cl :ros :roswell.util))
 (in-package :ros.script.init.3672012201)
 
 (defun main (&optional name &rest r)

lisp/install+7zip.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install-quicklisp")
 (defpackage :roswell.install.7zip+
-  (:use :cl :roswell.install :ros.util :roswell.locations))
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
 (in-package :roswell.install.7zip+)
 #-win32
 (progn

lisp/install+ffcall.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install-quicklisp")
 (defpackage :roswell.install.ffcall+
-  (:use :cl :roswell.install :ros.util :roswell.locations))
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
 (in-package :roswell.install.ffcall+)
 
 (defvar *ffcall-version* "1.10")

lisp/install+msys2.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install-quicklisp")
 (defpackage :roswell.install.msys2+
-  (:use :cl :roswell.install :ros.util :roswell.locations))
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
 (in-package :roswell.install.msys2+)
 #-win32
 (progn

lisp/install+sigsegv.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install-quicklisp")
 (defpackage :roswell.install.sigsegv+
-  (:use :cl :roswell.install :ros.util :roswell.locations))
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
 (in-package :roswell.install.sigsegv+)
 
 (defvar *sigsegv-version* "2.10")

lisp/install-abcl-bin.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install-quicklisp")
 (defpackage :roswell.install.abcl-bin
-  (:use :cl :roswell.install :ros.util :roswell.locations))
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
 (in-package :roswell.install.abcl-bin)
 
 (defvar *abcl-bin-get-version-cache* nil)

lisp/install-allegro.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install-quicklisp")
 (defpackage :roswell.install.allegro
-  (:use :cl :roswell.install :ros.util :roswell.locations))
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
 (in-package :roswell.install.allegro)
 (ros:quicklisp :environment nil)
 

lisp/install-ccl-bin.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install-quicklisp")
 (defpackage :roswell.install.ccl-bin
-  (:use :cl :roswell.install :ros.util :roswell.locations))
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
 (in-package :roswell.install.ccl-bin)
 
 (defun ccl-bin-get-version ()

lisp/install-clisp.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install-quicklisp")
 (defpackage :roswell.install.clisp
-  (:use :cl :roswell.install :ros.util :roswell.locations))
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
 (in-package :roswell.install.clisp)
 
 (defun clisp-get-version ()

lisp/install-cmu-bin.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install-quicklisp")
 (defpackage :roswell.install.cmu-bin
-  (:use :cl :roswell.install :ros.util :roswell.locations))
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
 (in-package :roswell.install.cmu-bin)
 
 (defun cmu-bin-get-version ()

lisp/install-ecl.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install-quicklisp")
 (defpackage :roswell.install.ecl
-  (:use :cl :roswell.install :ros.util :roswell.locations))
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
 (in-package :roswell.install.ecl)
 
 (defvar *ecl-options*

lisp/install-quicklisp.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install")
 (defpackage :roswell.install.quicklisp
-  (:use :cl :roswell.install :ros.util :roswell.locations))
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
 (in-package :roswell.install.quicklisp)
 
 (defun quicklisp-help (argv)

lisp/install-sbcl-bin.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install")
 (defpackage :roswell.install.sbcl-bin
-  (:use :cl :roswell.install :ros.util :roswell.locations))
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
 (in-package :roswell.install.sbcl-bin)
 
 ;; sbcl-bin is specially treated. Installation are mainly done by src/cmd-install-sbcl-bin.c.

lisp/install-sbcl.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install-quicklisp")
 (defpackage :roswell.install.sbcl
-  (:use :cl :roswell.install :ros.util :roswell.locations))
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
 (in-package :roswell.install.sbcl)
 
 #|

lisp/install-slime.lisp

@@ -4,7 +4,7 @@
   (ql:quickload '(:plump) :silent t))
 
 (defpackage :roswell.install.slime
-  (:use :cl :roswell.install :roswell.locations :ros.util))
+  (:use :cl :roswell.install :roswell.locations :roswell.util))
 (in-package :roswell.install.slime)
 
 (defun slime-help (argv)

lisp/list-dump.lisp

@@ -1,5 +1,5 @@
 (defpackage :roswell.list.dump
-  (:use :cl :ros.util))
+  (:use :cl :roswell.util))
 (in-package :roswell.list.dump)
 
 (defun dump (&rest params)

lisp/list-installed.lisp

@@ -1,5 +1,5 @@
 (defpackage :roswell.list.installed
-  (:use :cl :ros.util))
+  (:use :cl :roswell.util))
 (in-package :roswell.list.installed)
 
 (defun installed (&rest r)

lisp/list-versions.lisp

@@ -1,5 +1,5 @@
 (defpackage :roswell.list.versions
-  (:use :cl :ros.util))
+  (:use :cl :roswell.util))
 (in-package :roswell.list.versions)
 
 (defun versions (&rest params)

lisp/list.ros

@@ -9,7 +9,7 @@ exec ros +Q -m roswell -L sbcl-bin -- $0 "$@"
   (ros:include "system"))
 
 (defpackage :ros.script.list.3672012243
-  (:use :cl :ros.util))
+  (:use :cl :roswell.util))
 (in-package :ros.script.list.3672012243)
 
 (system "list-versions")

lisp/patch-quicklisp.lisp

@@ -1,5 +1,5 @@
 (ros:include "util")
-(in-package :ros.util)
+(in-package :roswell.util)
 (defun fetch-via-roswell (url file &key (follow-redirects t) quietly (maximum-redirects 10))
   "Request URL and write the body of the response to FILE."
   (declare (ignorable follow-redirects quietly maximum-redirects))
@@ -28,7 +28,7 @@
          (format nil "impls/~A/windows/7za/9.20/7za.exe"
                  (ros:roswell '("roswell-internal-use" "uname" "-m") :string
                               T))
-         (ros.util:homedir))))
+         (roswell.util:homedir))))
     (defmethod install ((release release))
       (let ((archive (ensure-local-archive-file release))
             (output

lisp/run-msys.lisp

@@ -1,6 +1,6 @@
 (ros:include "util-install-quicklisp")
 (defpackage :roswell.run.msys
-  (:use :cl :ros.util))
+  (:use :cl :roswell.util))
 (in-package :roswell.run.msys)
 
 (defvar *msys2-arch*)

lisp/run.ros

@@ -8,7 +8,7 @@ exec ros -Q -m roswell -L sbcl-bin -- $0 "$@"
   (ros:include "util"))
 
 (defpackage :ros.script.run.3668210999
-  (:use :cl :ros.util))
+  (:use :cl :roswell.util))
 (in-package :ros.script.run.3668210999)
 
 (defun main (system script verbose &rest rest)

lisp/setup.ros

@@ -8,7 +8,7 @@ exec ros -Q -L sbcl-bin -- $0 "$@"
   (ros:include "util"))
 
 (defpackage :ros.script.setup.3672012282
-  (:use :cl :ros.util))
+  (:use :cl :roswell.util))
 (in-package :ros.script.setup.3672012282)
 
 (defun split-spaces (line)

lisp/system.lisp

@@ -1,10 +1,7 @@
-(cl:in-package :cl-user)
+(in-package :roswell.util)
 
-#-asdf
-(require :asdf)
-
-(ros:include "util")
-(in-package :ros.util)
+(ros:ensure-asdf)
+(ros:include "util" "system")
 
 (defmacro system (file &key depends-on (prefix ":roswell"))
   (let ((pos (or (position #\- file)

lisp/template.ros

@@ -10,7 +10,7 @@ exec ros -Q -m roswell -L sbcl-bin -- $0 "$@"
   (ql:quickload '(:cl-base64 :chipz) :silent t))
 
 (defpackage :ros.script.template.3670908195
-  (:use :cl :ros.util))
+  (:use :cl :roswell.util))
 (in-package :ros.script.template.3670908195)
 
 (defvar *subcommands*  '(("rm" . template-rm)

lisp/use.ros

@@ -9,7 +9,7 @@ exec ros +R -Q -L sbcl-bin -m roswell -- $0 "$@"
   (ros:include "util-use"))
 
 (defpackage :ros.script.use.3672012320
-  (:use :cl :ros.util))
+  (:use :cl :roswell.util))
 (in-package :ros.script.use.3672012320)
 
 (defun main (&rest argv)

lisp/util-install.lisp

@@ -1,6 +1,6 @@
 (ros:include '("locations" "util") "util-install")
 (defpackage :roswell.install
-  (:use :cl :ros.util :roswell.locations)
+  (:use :cl :roswell.util :roswell.locations)
   (:export :*build-hook* :install-impl :read-call :*ros-path*
    :install-system-script :install-impl-if-probed :install-script-if-probed
    :install-system-if-probed :mingw-namestring :install-github :*checkout-default*

lisp/util-swank.lisp

@@ -1,6 +1,6 @@
 (ros:include "util")
 (defpackage :roswell.util.swank
-  (:use :cl :ros.util)
+  (:use :cl :roswell.util)
   (:export :swank))
 (in-package :roswell.util.swank)
 

lisp/util-use.lisp

@@ -1,7 +1,7 @@
 (ros:include "util" "util-use")
 
 (defpackage :roswell.util.use
-  (:use :cl :ros.util)
+  (:use :cl :roswell.util)
   (:export :use))
 (in-package :roswell.util.use)
 

lisp/util.lisp

@@ -1,17 +1,11 @@
-(cl:in-package :cl-user)
-(when (cl:find-package :ros.util)
-  (pushnew :ros.util *features*))
-
-(defpackage :ros.util
+(ros:include () "util")
+(defpackage :roswell.util
   (:use :cl)
   (:import-from :ros :opt)
   (:export :uname :uname-m :homedir :config :impl :which :list% :config-env
            :parse-version-spec :download :expand :sh :chdir :system :module
            :core-extention :clone-github :opt :read-call :set-opt :copy-dir))
-
-(in-package :ros.util)
-
-(ros:include () "util")
+(in-package :roswell.util)
 
 (defun read-call (func &rest params)
   (ignore-errors (apply (let (*read-eval*) (read-from-string func)) params)))