1
0
Fork 0

- removed bash as dependency (thanks op!);

- made quick_quicklisp.sh executable.
This commit is contained in:
cage 2022-02-18 19:06:09 +01:00
parent faaa26a5c9
commit 9070a72a64
4 changed files with 40 additions and 44 deletions

View File

@ -42,7 +42,6 @@
+ to install the package, including running the script to install
lisp libraries (~quick_quicklisp.sh~):
- AWK;
- BASH shell;
- git.
+ to run the program:

View File

@ -83,7 +83,6 @@ Table of Contents
to install the package, including running the script to install lisp
libraries (`quick_quicklisp.sh'):
• AWK;
• BASH shell;
• git.
to run the program:

View File

@ -73,13 +73,6 @@ if test "$MAN" = "no" ; then
AC_MSG_WARN([Can not find man.])
fi
AC_PATH_PROG([BASH],[bash],[no])
if test "$BASH" = "no" ; then
AC_MSG_ERROR([Can not find bash shell.])
exit 1;
fi
dnl autoconf has an automatic test for AWK
if test -z "${AWK}"; then
AC_MSG_ERROR([Can not find AWK.])
@ -107,6 +100,13 @@ if test "$GIT" = "no" ; then
exit 1;
fi
AC_PATH_PROGS([CHMOD],[chmod],[no])
if test "$CHMOD" = "no" ; then
AC_MSG_ERROR([Can not find chmod executable.])
exit 1;
fi
AC_PROG_MKDIR_P
dnl check sbcl version
@ -140,3 +140,5 @@ AC_CHECK_LIB([sqlite3], [sqlite3_libversion], [], AC_MSG_ERROR([Can not find lib
AC_CONFIG_FILES([Makefile quick_quicklisp.sh po/Makefile.in src/config.lisp.in])
AC_OUTPUT
${CHMOD} 750 quick_quicklisp.sh

View File

@ -1,4 +1,4 @@
#! @BASH@
#!/bin/sh
# tinmop: an humble mastodon client
# Copyright (C) 2020 cage
@ -27,30 +27,26 @@ QUICKLISP="quicklisp.lisp"
QUICKLISP_SIG="quicklisp.lisp.asc"
QUICKLISP_KEY="release-key"
QUICKLISP_SIGNATURE="D7A3 +489D +DEFE +32B7 +D0E7 +CC61 +3079 +65AB +028B +5FF7";
QUICKLISP_SIGNATURE="D7A3 +489D +DEFE +32B7 +D0E7 +CC61 +3079 +65AB +028B +5FF7"
LISP_SOURCE_REGISTRY_DIR="$HOME/.config/common-lisp/"
LISP_SOURCE_REGISTRY_FILE="$LISP_SOURCE_REGISTRY_DIR/source-registry.conf"
BOLD_TEXT="\033[1m"
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/;
CROATOAN_DIR="$QUICKLISP_INSTALL_DIR"/local-projects/croatoan/
CROATOAN_COMMIT=000c60428fe73d796d4ee032cfa5901eb57b4703
PURGATORY_GIT_URL=https://notabug.org/cage/purgatory.git
PURGATORY_DIR="$QUICKLISP_INSTALL_DIR"/local-projects/purgatory/;
PURGATORY_DIR="$QUICKLISP_INSTALL_DIR"/local-projects/purgatory/
echo_bold () {
echo -e "${BOLD_TEXT}${1}${NORMAL_TEXT}";
printf "\033[1m%s\033[0m\n" "$1"
}
check_croatoan (){
@ -75,33 +71,33 @@ check_quicklisp_signature () {
res1=$(LC_MESSAGES="C" @GPG@ --verify quicklisp.lisp.asc quicklisp.lisp 2> >(@AWK@ -- "${chk1_prog}"))
res2=$(@GPG@ --verify quicklisp.lisp.asc quicklisp.lisp 2> >(@AWK@ -- "${chk2_prog}"))
res=$(expr $res1 + $res2)
echo -n "$res"
printf "%s" "$res"
}
install_quicklisp () {
echo_bold "Downloading quicklisp...";
@CURL@ "$QUICKLISP_URL" > $QUICKLISP;
@CURL@ "$QUICKLISP_SIG_URL" > $QUICKLISP_SIG;
@CURL@ "$QUICKLISP_KEY_URL" > $QUICKLISP_KEY;
echo_bold "Importing gpg key.";
@GPG@ --import $QUICKLISP_KEY;
echo_bold "Verifing key";
signature_verified=$(check_quicklisp_signature);
echo_bold "Downloading quicklisp..."
@CURL@ "$QUICKLISP_URL" > $QUICKLISP
@CURL@ "$QUICKLISP_SIG_URL" > $QUICKLISP_SIG
@CURL@ "$QUICKLISP_KEY_URL" > $QUICKLISP_KEY
echo_bold "Importing gpg key."
@GPG@ --import $QUICKLISP_KEY
echo_bold "Verifing key"
signature_verified=$(check_quicklisp_signature)
if [ "$signature_verified" -ne $VERIFY_OK_RES ]; then
echo_bold "Key verification failed!"
exit 1;
exit 1
else
echo_bold "Key sucessfully verified.";
echo_bold "Key sucessfully verified."
@LISP_COMPILER@ --load $QUICKLISP \
--eval "(quicklisp-quickstart:install)" \
--eval "(ql:add-to-init-file)" \
--eval "(sb-ext:quit)";
@MKDIR_P@ $LISP_SOURCE_REGISTRY_DIR;
PAR_PWD="${PWD%/*}";
echo "(:source-registry" > $LISP_SOURCE_REGISTRY_FILE;
echo " (:tree \"$PAR_PWD\")" >> $LISP_SOURCE_REGISTRY_FILE;
echo ":inherit-configuration)" >> $LISP_SOURCE_REGISTRY_FILE;
echo "quicklisp installed";
@MKDIR_P@ $LISP_SOURCE_REGISTRY_DIR
PAR_PWD="${PWD%/*}"
echo "(:source-registry" > $LISP_SOURCE_REGISTRY_FILE
echo " (:tree \"$PAR_PWD\")" >> $LISP_SOURCE_REGISTRY_FILE
echo ":inherit-configuration)" >> $LISP_SOURCE_REGISTRY_FILE
echo "quicklisp installed"
fi
}
@ -140,7 +136,7 @@ install_dependency () {
--eval "(ql:quickload \"cffi\")" \
--eval "(ql:quickload \"babel\")" \
--eval "(ql:quickload \"percent-encoding\")" \
--eval "(sb-ext:quit)";
--eval "(sb-ext:quit)"
}
install_croatoan () {
@ -160,18 +156,18 @@ install_croatoan () {
}
quicklisp_installed_p=$(check_quicklisp);
quicklisp_installed_p=$(check_quicklisp)
if [ $quicklisp_installed_p -eq 0 ]; then
echo_bold "Quicklisp already installed; fetching libraries...";
install_dependency;
echo_bold "Quicklisp already installed; fetching libraries..."
install_dependency
else
install_quicklisp;
install_dependency;
install_quicklisp
install_dependency
fi
echo_bold "installing croatoan from git repository...";
echo_bold "installing croatoan from git repository..."
install_croatoan;
install_croatoan
echo_bold "Finished.";
echo_bold "Finished."