diff --git a/cryptlib/config-v1.sh b/cryptlib/config-v1.sh new file mode 100644 index 0000000..e69de29 diff --git a/cryptlib/install-v1.sh b/cryptlib/install-v1.sh new file mode 100644 index 0000000..e69de29 diff --git a/cryptlib/cl-linux-yield.patch b/cryptlib/patches/cl-linux-yield.patch similarity index 100% rename from cryptlib/cl-linux-yield.patch rename to cryptlib/patches/cl-linux-yield.patch diff --git a/cryptlib/gccversion-3431.patch b/cryptlib/patches/gccversion-3431.patch similarity index 100% rename from cryptlib/gccversion-3431.patch rename to cryptlib/patches/gccversion-3431.patch diff --git a/cryptlib/gccversion-345.patch b/cryptlib/patches/gccversion-345.patch similarity index 100% rename from cryptlib/gccversion-345.patch rename to cryptlib/patches/gccversion-345.patch diff --git a/cryptlib/prompt-v1.sh b/cryptlib/prompt-v1.sh index e69de29..f0f9546 100644 --- a/cryptlib/prompt-v1.sh +++ b/cryptlib/prompt-v1.sh @@ -0,0 +1,8 @@ +CRYPT=$(whiptail --title "SSL SSH Support in Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ + "Yes" "Add ssl Support" ON \ + "No" "Don't add ssl Support" OFF \ + 3>&1 1>&2 2>&3) + exitstatus=$? +if [ $exitstatus = 0 ]; then + echo -e "${DGN}Add ssl Support: ${BGN}$CRYPT${CL}" +fi diff --git a/dbp/config-v1.sh b/dbp/config-v1.sh new file mode 100644 index 0000000..e69de29 diff --git a/dbp/prompt-v1.sh b/dbp/prompt-v1.sh index e69de29..1fe3b79 100644 --- a/dbp/prompt-v1.sh +++ b/dbp/prompt-v1.sh @@ -0,0 +1,8 @@ +DBPSCRIPTS=$(whiptail --title "Add The Disconnected by Peer Support Script to Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ + "Yes" "Add DbP Script" ON \ + "No" "Don't add DbP Script" OFF \ + 3>&1 1>&2 2>&3) + exitstatus=$? +if [ $exitstatus = 0 ]; then + echo -e "${DGN}Add DbP Support Script: ${BGN}$DBPSCRIPTS${CL}" +fi diff --git a/dosemu2/config-v1.sh b/dosemu2/config-v1.sh new file mode 100644 index 0000000..e69de29 diff --git a/dosemu2/install-v1.sh b/dosemu2/install-v1.sh new file mode 100644 index 0000000..e69de29 diff --git a/dosemu2/prompt-v1.sh b/dosemu2/prompt-v1.sh new file mode 100644 index 0000000..f9427e7 --- /dev/null +++ b/dosemu2/prompt-v1.sh @@ -0,0 +1,8 @@ +DOSEMU=$(whiptail --title "Add DosEmu2 to Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ + "Yes" "Add DosEmu2 Script" ON \ + "No" "Don't add DosEmu2 Script" OFF \ + 3>&1 1>&2 2>&3) + exitstatus=$? +if [ $exitstatus = 0 ]; then + echo -e "${DGN}Add DbP Script: ${BGN}$DOSEMU${CL}" +fi diff --git a/fail2ban/config-v1.sh b/fail2ban/config-v1.sh new file mode 100644 index 0000000..e69de29 diff --git a/fail2ban/prompt-v1.sh b/fail2ban/prompt-v1.sh index e69de29..a32e8c3 100644 --- a/fail2ban/prompt-v1.sh +++ b/fail2ban/prompt-v1.sh @@ -0,0 +1,9 @@ +BANUNBAN=$(whiptail --title "Add Ban / Unban to Mystic" --radiolist --cancel-button Exit-Script "Choose Fail2Ban IpBan No" 12 58 5 \ + "fail2ban" "Add Fail2Ban" ON \ + "ipban" "Add IpBan" OFF \ + "No" "Don't add IP Banning" OFF \ + 3>&1 1>&2 2>&3) + exitstatus=$? +if [ $exitstatus = 0 ]; then + echo -e "${DGN}Add Fail2Ban: ${BGN}$BANUNBAN${CL}" +fi diff --git a/install-next.sh b/install-next.sh index 7f7b386..e574e51 100644 --- a/install-next.sh +++ b/install-next.sh @@ -142,7 +142,7 @@ apt install -y curl &>/dev/null apt install -y wget &>/dev/null apt install -y gnupg &>/dev/null mkdir -p $MSTEMPDIR &>/dev/null -msg_ok "Setup ${APP} Repository" +msg_ok "Setting up ${APP} Repository" #============================================================================================================== @@ -156,90 +156,27 @@ msg_ok "Downloading ${APP} Mystic BBS Disconnected-by-Peer Installer Files" #============================================================================================================== +# Mystic install Directory source $MSTEMPDIR/mystic/mystic/prompt-${SCRIPT_VER}.sh +# Add Cryptlib support +source $MSTEMPDIR/mystic/cryptlib/prompt-${SCRIPT_VER}.sh +# Add Spellcheck +source $MSTEMPDIR/mystic/spellcheck/prompt-${SCRIPT_VER}.sh +# Add Multi Relay Chat Client +source $MSTEMPDIR/mystic/mrc-client/prompt-${SCRIPT_VER}.sh +# Add Multi Relay Chat Server +source $MSTEMPDIR/mystic/mrc-server/prompt-${SCRIPT_VER}.sh +# Add IP2Location +source $MSTEMPDIR/mystic/ip2location/prompt-${SCRIPT_VER}.sh +# Add DBP Scripts +source $MSTEMPDIR/mystic/dbp/prompt-${SCRIPT_VER}.sh +# Add Fail2ban | banip +source $MSTEMPDIR/mystic/fail2ban/prompt-${SCRIPT_VER}.sh +# Add Fail2ban | banip +source $MSTEMPDIR/mystic/dosemu2/prompt-${SCRIPT_VER}.sh exit 0 -MSAPPDIR=$(whiptail --inputbox "Mystic Install Directory that also must be set in the Mystic insallation Programm." 8 58 $MSDIR --title "Install Directory" --cancel-button Exit-Script 3>&1 1>&2 2>&3) -exitstatus=$? -if [ -z $MSAPPDIR ]; then - MYSTIC_DIR="$MSDIR" - echo -e "${DGN}Installing Mystic to: ${BGN}$MYSTIC_DIR${CL}" -else - if [ $exitstatus = 0 ]; then - MYSTIC_DIR="$MSAPPDIR" - echo -e "${DGN}Installing Mystic to: ${BGN}$MYSTIC_DIR${CL}" - fi -fi - -MUTIL_DIR=${MYSTIC_DIR}/mutil.d - -CRYPT=$(whiptail --title "SSL SSH Support in Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ - "Yes" "Add ssl Support" ON \ - "No" "Don't add ssl Support" OFF \ - 3>&1 1>&2 2>&3) - exitstatus=$? -if [ $exitstatus = 0 ]; then - echo -e "${DGN}Add ssl Support: ${BGN}$CRYPT${CL}" -fi - -SPELL=$(whiptail --title "Spellcheck Support in Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ - "Yes" "Add Spellcheck Support" ON \ - "No" "Don't add Spellcheck Support" OFF \ - 3>&1 1>&2 2>&3) - exitstatus=$? -if [ $exitstatus = 0 ]; then - echo -e "${DGN}Add Spellcheck Support: ${BGN}$SPELL${CL}" -fi - -MRC=$(whiptail --title "Multi Relay Chat Support in Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ - "Yes" "Add MrC Support" ON \ - "No" "Don't add MrC Support" OFF \ - 3>&1 1>&2 2>&3) - exitstatus=$? -if [ $exitstatus = 0 ]; then - echo -e "${DGN}Add Multi Realy Chat Support: ${BGN}$MRC${CL}" -fi - -IP2L=$(whiptail --title "Add The IP2Location Download Client to Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ - "Yes" "Add IP2Location Download Client" ON \ - "No" "Don't Add IP2Location Download Client" OFF \ - 3>&1 1>&2 2>&3) - exitstatus=$? -if [ $exitstatus = 0 ]; then - echo -e "${DGN}Add DbP Script: ${BGN}$IP2L${CL}" -fi - -DBPSCRIPTS=$(whiptail --title "Add The Disconnected by Peer Script to Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ - "Yes" "Add DbP Script" ON \ - "No" "Don't add DbP Script" OFF \ - 3>&1 1>&2 2>&3) - exitstatus=$? -if [ $exitstatus = 0 ]; then - echo -e "${DGN}Add DbP Script: ${BGN}$DBPSCRIPTS${CL}" -fi - -BANUNBAN=$(whiptail --title "Add Ban / Anban to Mystic" --radiolist --cancel-button Exit-Script "Choose Fail2Ban IpBan No" 12 58 5 \ - "fail2ban" "Add Fail2Ban" ON \ - "ipban" "Add IpBan" OFF \ - "No" "Don't add IP Banning" OFF \ - 3>&1 1>&2 2>&3) - exitstatus=$? -if [ $exitstatus = 0 ]; then - echo -e "${DGN}Add Fail2Ban: ${BGN}$BANUNBAN${CL}" -fi - -DOSEMU=$(whiptail --title "Add DosEmu2 to Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ - "Yes" "Add DosEmu2 Script" ON \ - "No" "Don't add DosEmu2 Script" OFF \ - 3>&1 1>&2 2>&3) - exitstatus=$? -if [ $exitstatus = 0 ]; then - echo -e "${DGN}Add DbP Script: ${BGN}$DOSEMU${CL}" -fi - - - #============================================================================================================== msg_info "Starting ${APP} Installation !!!! Plz set Installation dir the same as bevor !!!" diff --git a/install.sh b/install.sh index 7bb76eb..6b51251 100644 --- a/install.sh +++ b/install.sh @@ -351,8 +351,8 @@ pushd /usr/local/src/mystic/cryptlib-3.4.5 &>/dev/null unzip ../cryptlib345.zip &>/dev/null dos2unix tools/* &>/dev/null dos2unix kernel/* &>/dev/null -patch -p1 -i /usr/local/src/mystic/mystic/cryptlib/gccversion-345.patch &>/dev/null -patch -p0 -i /usr/local/src/mystic/mystic/cryptlib/cl-linux-yield.patch &>/dev/null +patch -p1 -i /usr/local/src/mystic/mystic/cryptlib/patches/gccversion-345.patch &>/dev/null +patch -p0 -i /usr/local/src/mystic/mystic/cryptlib/patches/cl-linux-yield.patch &>/dev/null ln -sf gcc-9 /usr/bin/gcc &>/dev/null ln -sf g++-9 /usr/bin/g++ &>/dev/null ln -sf cpp-9 /usr/bin/cpp &>/dev/null diff --git a/ip2location/config-v1.sh b/ip2location/config-v1.sh new file mode 100644 index 0000000..e69de29 diff --git a/ip2location/install-v1.sh b/ip2location/install-v1.sh new file mode 100644 index 0000000..e69de29 diff --git a/ip2location/prompt-v1.sh b/ip2location/prompt-v1.sh new file mode 100644 index 0000000..0630981 --- /dev/null +++ b/ip2location/prompt-v1.sh @@ -0,0 +1,8 @@ +IP2L=$(whiptail --title "Add The IP2Location Download Client to Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ + "Yes" "Add IP2Location Download Client" ON \ + "No" "Don't Add IP2Location Download Client" OFF \ + 3>&1 1>&2 2>&3) + exitstatus=$? +if [ $exitstatus = 0 ]; then + echo -e "${DGN}Add DbP Script: ${BGN}$IP2L${CL}" +fi diff --git a/mrc-client/config-v1.sh b/mrc-client/config-v1.sh new file mode 100644 index 0000000..e69de29 diff --git a/mrc-client/prompt-v1.sh b/mrc-client/prompt-v1.sh index e69de29..7687203 100644 --- a/mrc-client/prompt-v1.sh +++ b/mrc-client/prompt-v1.sh @@ -0,0 +1,8 @@ +MRCCLIENT=$(whiptail --title "Multi Relay Chat Support in Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ + "Yes" "Add MrC Support" ON \ + "No" "Don't add MrC Support" OFF \ + 3>&1 1>&2 2>&3) + exitstatus=$? +if [ $exitstatus = 0 ]; then + echo -e "${DGN}Add Multi Realy Chat Support: ${BGN}$MRCCLIENT${CL}" +fi diff --git a/mrc-server/config-v1.sh b/mrc-server/config-v1.sh new file mode 100644 index 0000000..e69de29 diff --git a/mrc-server/prompt-v1.sh b/mrc-server/prompt-v1.sh index e69de29..b6b3cae 100644 --- a/mrc-server/prompt-v1.sh +++ b/mrc-server/prompt-v1.sh @@ -0,0 +1,8 @@ +MRCSERVER=$(whiptail --title "Multi Relay Chat Server Support in Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ + "Yes" "Add MrC Support" OFF \ + "No" "Don't add MrC Support" ON \ + 3>&1 1>&2 2>&3) + exitstatus=$? +if [ $exitstatus = 0 ]; then + echo -e "${DGN}Add Multi Realy Chat Server Support: ${BGN}$MRCSERVER${CL}" +fi diff --git a/mystic/config-v1.sh b/mystic/config-v1.sh new file mode 100644 index 0000000..e69de29 diff --git a/spellcheck/config-v1.sh b/spellcheck/config-v1.sh new file mode 100644 index 0000000..e69de29 diff --git a/spellcheck/install-v1.sh b/spellcheck/install-v1.sh new file mode 100644 index 0000000..e69de29 diff --git a/spellcheck/prompt-v1.sh b/spellcheck/prompt-v1.sh new file mode 100644 index 0000000..0751fe4 --- /dev/null +++ b/spellcheck/prompt-v1.sh @@ -0,0 +1,8 @@ +SPELL=$(whiptail --title "Spellcheck Support in Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ + "Yes" "Add Spellcheck Support" ON \ + "No" "Don't add Spellcheck Support" OFF \ + 3>&1 1>&2 2>&3) + exitstatus=$? +if [ $exitstatus = 0 ]; then + echo -e "${DGN}Add Spellcheck Support: ${BGN}$SPELL${CL}" +fi