diff options
| author | Matthias Benkard <code@mail.matthias.benkard.de> | 2009-10-11 12:03:16 +0200 |
|---|---|---|
| committer | Matthias Benkard <code@mail.matthias.benkard.de> | 2009-10-11 12:03:16 +0200 |
| commit | 829d433565ac1d0c901a84c01cf004ad714379bb (patch) | |
| tree | 86dfdefab99a47fec40b511135d7f28e162289ed | |
| parent | 766b707106e052fc57a97b8dcd8b017475662317 (diff) | |
CGI helpers: Take care to concatenate the FASL files in the right order.
Ignore-this: 9a321092fbd28e0405a6b930d814767e
darcs-hash:5493276d094827ef370a9463216771ff87758f6d
| -rwxr-xr-x | journal-admin.cgi | 2 | ||||
| -rwxr-xr-x | journal.cgi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/journal-admin.cgi b/journal-admin.cgi index 770ddf9..c743307 100755 --- a/journal-admin.cgi +++ b/journal-admin.cgi @@ -19,7 +19,7 @@ lisp_mtime=`mtime_of $most_recently_changed_lisp_file` if ! [ -f "$FASL_FILE" -a \( `mtime_of "$FASL_FILE"` -gt $lisp_mtime \) ]; then env LC_ALL=de_DE.UTF-8 clisp -M "$LISPINIT_DIR/lispinit.mem.gz" "$DIR/compile.lisp" &&\ - find "$DIR" -name "*.fas" -print0 | xargs -0 cat > "$FASL_FILE" + (cd "$DIR" && cat cybertiggyr-time/time.fas xmls/xmls.fas ironclad/package.fas ironclad/macro-utils.fas ironclad/digest.fas ironclad/sha1.fas defpackage.fas macros.fas globals.fas utils.fas journal-content.fas journal.fas main.fas > "$FASL_FILE") fi exec env LC_ALL=de_DE.UTF-8 clisp -q -q -M "$LISPINIT_DIR/lispinit.mem.gz" -x "(progn (load \"$FASL_FILE\") (cl-user::script-main :admin-mode t))" diff --git a/journal.cgi b/journal.cgi index a719526..d9533fc 100755 --- a/journal.cgi +++ b/journal.cgi @@ -19,7 +19,7 @@ lisp_mtime=`mtime_of $most_recently_changed_lisp_file` if ! [ -f "$FASL_FILE" -a \( `mtime_of "$FASL_FILE"` -gt $lisp_mtime \) ]; then env LC_ALL=de_DE.UTF-8 clisp -M "$LISPINIT_DIR/lispinit.mem.gz" "$DIR/compile.lisp" &&\ - find "$DIR" -name "*.fas" -print0 | xargs -0 cat > "$FASL_FILE" + (cd "$DIR" && cat cybertiggyr-time/time.fas xmls/xmls.fas ironclad/package.fas ironclad/macro-utils.fas ironclad/digest.fas ironclad/sha1.fas defpackage.fas macros.fas globals.fas utils.fas journal-content.fas journal.fas main.fas > "$FASL_FILE") fi exec env LC_ALL=de_DE.UTF-8 clisp -q -q -M "$LISPINIT_DIR/lispinit.mem.gz" -x "(progn (load \"$FASL_FILE\") (cl-user::script-main))" |