瀏覽代碼

Loading of quicklisp

Bob Mottram 8 年之前
父節點
當前提交
9519b1a5ec
共有 1 個檔案被更改,包括 15 行新增6 行删除
  1. 15
    6
      src/freedombone-app-turtl

+ 15
- 6
src/freedombone-app-turtl 查看文件

@@ -389,16 +389,25 @@ function install_turtl {
389 389
     function_check add_ddns_domain
390 390
     add_ddns_domain $TURTL_DOMAIN_NAME
391 391
 
392
-    sed -i 's|CCL_DEFAULT_DIRECTORY=.*|CCL_DEFAULT_DIRECTORY=$HOME/ccl|g' /var/www/$TURTL_DOMAIN_NAME/htdocs/ccl/scripts/ccl
393
-    sed -i 's|CCL_DEFAULT_DIRECTORY=.*|CCL_DEFAULT_DIRECTORY=$HOME/ccl|g' /var/www/$TURTL_DOMAIN_NAME/htdocs/ccl/scripts/ccl64
392
+    sed -i 's|CCL_DEFAULT_DIRECTORY=.*|CCL_DEFAULT_DIRECTORY=/usr/local/src/ccl|g' /usr/bin/ccl
393
+    sed -i 's|CCL_DEFAULT_DIRECTORY=.*|CCL_DEFAULT_DIRECTORY=/usr/local/src/ccl|g' /usr/bin/ccl64
394 394
 
395 395
     adduser --disabled-login --home=/var/www/$TURTL_DOMAIN_NAME/htdocs --gecos 'turtl' turtl
396
+
397
+    cp /usr/local/src/asdf.lisp /var/www/$TURTL_DOMAIN_NAME/htdocs
398
+    cp /usr/local/src/quicklisp.lisp /var/www/$TURTL_DOMAIN_NAME/htdocs
399
+    echo '(load (compile-file "asdf.lisp"))' > /var/www/$TURTL_DOMAIN_NAME/htdocs/install.lisp
400
+    echo '(load (compile-file "quicklisp.lisp"))' >> /var/www/$TURTL_DOMAIN_NAME/htdocs/install.lisp
401
+    echo '(quicklisp-quickstart:install)' >> install.lisp
402
+    echo '(ql:add-to-init-file)' >> install.lisp
403
+
396 404
     chown -R turtl:turtl /var/www/$TURTL_DOMAIN_NAME/htdocs
405
+
397 406
     check_architecture=$(uname -a)
398 407
     if [[ "$check_architecture" == *"64"* && "$check_architecture" != *"arm"* ]]; then
399
-        su -c '$HOME/ccl/scripts/ccl --load install.lisp --eval "(quit)"' - turtl
408
+        su -c '/usr/bin/ccl64 --load install.lisp --eval "(quit)"' - turtl
400 409
     else
401
-        su -c '$HOME/ccl/scripts/ccl64 --load install.lisp --eval "(quit)"' - turtl
410
+        su -c '/usr/bin/ccl --load install.lisp --eval "(quit)"' - turtl
402 411
     fi
403 412
 
404 413
     echo "(pushnew \"./\" asdf:*central-registry* :test #'equal)" > /var/www/$TURTL_DOMAIN_NAME/htdocs/api/launch.lisp
@@ -419,8 +428,8 @@ function install_turtl {
419 428
     echo '(let ((quicklisp-init (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname))))' >> /var/www/$TURTL_DOMAIN_NAME/htdocs/.ccl-init.lisp
420 429
     echo '  (when (probe-file quicklisp-init)' >> /var/www/$TURTL_DOMAIN_NAME/htdocs/.ccl-init.lisp
421 430
     echo '    (load quicklisp-init)))' >> /var/www/$TURTL_DOMAIN_NAME/htdocs/.ccl-init.lisp
422
-    echo '(cwd "$HOME/api")' >> /var/www/$TURTL_DOMAIN_NAME/htdocs/.ccl-init.lisp
423
-    echo '(load "$HOME/api/launch")' >> /var/www/$TURTL_DOMAIN_NAME/htdocs/.ccl-init.lisp
431
+    echo '(cwd "~/api")' >> /var/www/$TURTL_DOMAIN_NAME/htdocs/.ccl-init.lisp
432
+    echo '(load "~/api/launch")' >> /var/www/$TURTL_DOMAIN_NAME/htdocs/.ccl-init.lisp
424 433
 
425 434
     chmod a+w /var/www/$TURTL_DOMAIN_NAME/htdocs
426 435
     chown -R turtl:turtl /var/www/$TURTL_DOMAIN_NAME/htdocs