From af389e898167870596c7d2b603a1973825d245a8 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sat, 20 Apr 2024 13:35:01 +0200 Subject: [PATCH] move cryptlib compile to install script --- cryptlib/install-v1.sh | 6 +++--- mrc-server/install-v1.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cryptlib/install-v1.sh b/cryptlib/install-v1.sh index 7e0dad8..432383c 100644 --- a/cryptlib/install-v1.sh +++ b/cryptlib/install-v1.sh @@ -24,9 +24,9 @@ ln -sf libcl.so.3 ${LIBDIR}/libcl.so &>/dev/null popd &>/dev/null msg_ok "Setting up ${APP} cryptlib for ssh/ssl (be patient compiling cryptlib)" -msg_info "Setting up ${APP} pemtrans (be patient compiling cryptlib)" +msg_info "Setting up ${APP} pemtrans (be patient compiling pemtrans)" SSLDEV=$(apt-cache madison libssl-dev | grep 1.0.1 | awk '{print $3}') -apt install -y =libssl-dev-${SSLDEV} +apt install -y libssl-dev=${SSLDEV} wget -N https://github.com/amenonsen/pemtrans/archive/refs/heads/master.zip -O $MSTEMPDIR/pemtrans.zip &>/dev/null rm -rf $MSTEMPDIR/pemtrans-master &>/dev/null pushd $MSTEMPDIR/ &>/dev/null @@ -53,7 +53,7 @@ popd &>/dev/null apt purge -y gcc g++ cpp &>/dev/null apt install -y gcc g++ cpp &>/dev/null -msg_ok "Setting up ${APP} pemtrans (be patient compiling cryptlib)" +msg_ok "Setting up ${APP} pemtrans (be patient compiling pemtrans)" fi diff --git a/mrc-server/install-v1.sh b/mrc-server/install-v1.sh index b471b9c..ea83b58 100644 --- a/mrc-server/install-v1.sh +++ b/mrc-server/install-v1.sh @@ -1,5 +1,5 @@ if [ $MRCSERVER = "Yes" ]; then -msg_info "Setting up Multi Relay Chat for ${APP}" +msg_info "Setting up Multi Relay Chat Server for ${APP}" apt install -y build-essential &>/dev/null wget -N https://sourceforge.net/projects/mystic-relay-chat/files/mrc_${MRC_SERVER_VER}.zip -O $MSTEMPDIR/mrc${MRC_SERVER_VER}.zip &>/dev/null rm -rf $MSTEMPDIR/mrc${MRC_SERVER_VER} &>/dev/null @@ -11,9 +11,9 @@ cp sysop.doc ${MYSTIC_DIR}/docs/mrc_server_sysop.doc cp whatsnew.txt ${MYSTIC_DIR}/docs/mrc_server_whatsnew.txt cp servers.lst ${MYSTIC_DIR}/docs/mrc_server_server.lst popd &>/dev/null -msg_ok "Setting up Multi Relay Chat for ${APP}" +msg_ok "Setting up Multi Relay Chat Server for ${APP}" -msg_info "Installing Multi Relay Chat Systemd Start/Stop Scripts and Service File" +msg_info "Installing Multi Relay Chat Server Systemd Start/Stop Scripts and Service File" pushd $MSTEMPDIR/mystic/mrc-server &>/dev/null sed -e "s!@MYSTIC_DIR@!${MYSTIC_DIR}!g" mrc_server-start.sh > ${MYSTIC_DIR}/mrc_server-start chmod +x ${MYSTIC_DIR}/mrc_server-start @@ -22,6 +22,6 @@ chmod +x ${MYSTIC_DIR}/mrc_server-stop sed -e "s!@MYSTIC_DIR@!${MYSTIC_DIR}!g" mrc-server.service > /etc/systemd/system/mrc-server.service systemctl daemon-reload popd &>/dev/null -msg_ok "Installing Multi Relay Chat Systemd Start/Stop Scripts and Service File" +msg_ok "Installing Multi Relay Chat Server Systemd Start/Stop Scripts and Service File" fi