[clfswm-devel] [PATCH] When running the dumped image as our CLFSWM executable, we do not need

[Xavier Maillard]

This patch just fixes an annoyance when calling our script without any
argument. The script was first trying to test for a common lisp
implementation and all mandatory lisp "objects" (clfswm.asd and
asdf.lisp). These tests have been deported where they are really
needed that is to say where we *build* the image.

Now, we can just call clfswm without arguments from our .xinitrc file.

Signed-off-by: Xavier Maillard <xma at gnu.org>
---
 contrib/clfswm |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/clfswm b/contrib/clfswm
index dcb557e..6f25140 100644
--- a/contrib/clfswm
+++ b/contrib/clfswm
@@ -103,9 +103,6 @@ do
     shift
 done
 
-test -x $(type -p $lisp) || die "$lisp can't be found."
-test -e $clfswm_asd_path/clfswm.asd || die "can't find clfswm.asd in $clfswm_asd_path"
-test -e $asdf_path/asdf.lisp || die "can't find asdf.lisp in $asdf_path"
 
 dump_image="$dump_path/clfswm-$(cksum $(type -p $lisp) | cut -d ' ' -f 1).core"
 
@@ -120,7 +117,11 @@ if test ! -e "$dump_image" ||
         do  test "$dump_image" -ot "$i" && exit 1
         done )
 then
-	eval build_$lisp
+    test -x $(type -p $lisp) || die "$lisp can't be found."
+    test -e $clfswm_asd_path/clfswm.asd || die "can't find clfswm.asd in $clfswm_asd_path"
+    test -e $asdf_path/asdf.lisp || die "can't find asdf.lisp in $asdf_path"
+
+    eval build_$lisp
 fi
 
 # Run the resulting image
-- 
1.5.2.2