diff --git a/Makefile.in b/Makefile.in index f227600..b696873 100644 --- a/Makefile.in +++ b/Makefile.in @@ -286,6 +286,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GIT = @GIT@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GPG = @GPG@ diff --git a/README.org b/README.org index 1087212..78d7a70 100644 --- a/README.org +++ b/README.org @@ -42,7 +42,8 @@ + to install the package, including running the script to install lisp libraries (~quick_quicklisp.sh~): - AWK; - - BASH shell. + - BASH shell; + - git. + to run the program: - SBCL compiler; diff --git a/README.txt b/README.txt index 8453f72..d5e986e 100644 --- a/README.txt +++ b/README.txt @@ -83,7 +83,8 @@ Table of Contents ⁃ to install the package, including running the script to install lisp libraries (`quick_quicklisp.sh'): • AWK; - • BASH shell. + • BASH shell; + • git. ⁃ to run the program: • SBCL compiler; diff --git a/configure b/configure index 7e8db7c..cc25d10 100755 --- a/configure +++ b/configure @@ -590,6 +590,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +GIT OPENSSL XDG_OPEN BASH @@ -6469,6 +6470,58 @@ if test "$OPENSSL" = "no" ; then exit 1; fi +for ac_prog in git +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GIT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GIT="$GIT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GIT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GIT=$ac_cv_path_GIT +if test -n "$GIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5 +$as_echo "$GIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$GIT" && break +done +test -n "$GIT" || GIT="no" + + +if test "$GIT" = "no" ; then + as_fn_error $? "Can not find git executable." "$LINENO" 5 + exit 1; +fi + SBCL_MIN_VERSION="1.4.16"; diff --git a/configure.ac b/configure.ac index 1346bc1..2acc049 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,13 @@ if test "$OPENSSL" = "no" ; then exit 1; fi +AC_PATH_PROGS([GIT],[git],[no]) + +if test "$GIT" = "no" ; then + AC_MSG_ERROR([Can not find git executable.]) + exit 1; +fi + AC_PROG_MKDIR_P dnl check sbcl version diff --git a/quick_quicklisp.sh.in b/quick_quicklisp.sh.in index 3ac69df..ade8626 100644 --- a/quick_quicklisp.sh.in +++ b/quick_quicklisp.sh.in @@ -39,10 +39,22 @@ NORMAL_TEXT="\033[0m" VERIFY_OK_RES=2 +CROATOAN_GIT_URL=https://github.com/McParen/croatoan.git + +CROATOAN_DIR="$QUICKLISP_INSTALL_DIR"/local-projects/croatoan/; + echo_bold () { echo -e "${BOLD_TEXT}${1}${NORMAL_TEXT}"; } +check_croatoan (){ + if [ -d $CROATOAN_DIR ]; then + echo 0; + else + echo 1; + fi +} + check_quicklisp () { if [ -d "$QUICKLISP_INSTALL_DIR" ]; then echo 0; @@ -125,6 +137,16 @@ install_dependency () { --eval "(sb-ext:quit)"; } +install_croatoan () { + installedp=$(check_croatoan); + if [ $installedp -eq 0 ]; then + cd $CROATOAN_DIR && @GIT@ pull + else + cd $QUICKLISP_INSTALL_DIR/local-projects/ && @GIT@ clone $CROATOAN_GIT_URL + fi +} + + quicklisp_installed_p=$(check_quicklisp); if [ $quicklisp_installed_p -eq 0 ]; then @@ -135,4 +157,8 @@ else install_dependency; fi -echo_bold "Finished." +echo_bold "installing croatoan from git repository..."; + +install_croatoan; + +echo_bold "Finished.";