From fcef50c7276f0d3a79dd160817d711b5aeed1840 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Mon, 15 Apr 2024 08:38:48 +0200
Subject: [PATCH] copy install scrip to the new design of install script

---
 install-v1.sh => install-next.sh | 29 +++++++++++++++++++----------
 install.sh                       | 19 ++++++++++---------
 2 files changed, 29 insertions(+), 19 deletions(-)
 rename install-v1.sh => install-next.sh (96%)

diff --git a/install-v1.sh b/install-next.sh
similarity index 96%
rename from install-v1.sh
rename to install-next.sh
index f07a029..c1d77f8 100644
--- a/install-v1.sh
+++ b/install-next.sh
@@ -12,9 +12,10 @@ CM="${GN}✓${CL}"
 APP="Mystic"
 MSDIR="/opt/mystic"
 TMP_DIR=$(mktemp -d)
-ARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-apt install lsb-release -y &>/dev/null
+apt install lsb-release dpkg-dev -y &>/dev/null
+
+ARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 DIST=$(lsb_release -i -s)
 CODENAME=$(lsb_release -c -s)
@@ -25,9 +26,9 @@ USER=$(getent shadow mystic)
 FAIL2BAN_GROUP=$(getent group fail2ban)
 IPBAN_GROUP=$(getent group ipban)
 
-
 LIBDIR=/usr/lib/${ARCH}
 MYSTIC_VER="112a48"
+SCRIPT_VER"v1"
 
 if [ "${ARCH}" = "x86_64-linux-gnu" ]; then
     INIMOD_ARCH="amd64"
@@ -50,7 +51,7 @@ else
     exit 1
 fi
 
-if [ "${CODENAME}" = "bullseye" ]; then
+if [ "${CODENAME}" = "bookworm" ]; then
     DIST="kinetic"
 elif [ "${CODENAME}" = "bullseye" ]; then
     DIST="focal"
@@ -226,6 +227,14 @@ fi
 
 #==============================================================================================================
 
+if [ "${CODENAME}" = "bookworm" ]; then
+msg_info "adding bullseye repository to bookworm for python2"
+echo "deb http://deb.debian.org/debian bullseye contrib non-free main" > /etc/apt/sources.list.d/bullseye &>/dev/null
+echo "deb http://deb.debian.org/debian bullseye-updates contrib non-free main" >> /etc/apt/sources.list.d/bullseye &>/dev/null
+echo "deb http://security.debian.org bullseye-security contrib non-free main" >> /etc/apt/sources.list.d/bullseye &>/dev/null
+msg_ok "Finisched adding bullseye repository"
+fi
+
 msg_info "Starting ${APP} Installation !!!! Plz set Installation dir the same as bevor !!!"
 apt install -y unrar-free python3 python2 &>/dev/null
 wget -N http://www.mysticbbs.com/downloads/mys${MYSTIC_VER}_${MYSTIC_ARCH}.${MYSTIC_EXT} -O /usr/local/src/mystic/mys${MYSTIC_VER}_${MYSTIC_ARCH}.${MYSTIC_EXT} &>/dev/null
@@ -254,7 +263,7 @@ msg_ok "Downloading ${APP} Systemd Start/Stop Scripts and Service File"
 
 msg_info "Installing ${APP} Systemd Start/Stop Scripts and Service File"
 pushd /usr/local/src/mystic/mystic/mis &>/dev/null
-bash install.sh $MYSTIC_DIR &>/dev/null
+bash install-${SCRIPT_VER}.sh $MYSTIC_DIR &>/dev/null
 popd &>/dev/null
 msg_ok "Installing ${APP} Systemd Start/Stop Scripts and Service File"
 
@@ -320,7 +329,7 @@ msg_ok "Setting up Multi Relay Chat for ${APP}"
 
 msg_info "Installing Multi Relay Chat Systemd Start/Stop Scripts and Service File"
 pushd /usr/local/src/mystic/mystic/mrc &>/dev/null
-bash install.sh $MYSTIC_DIR &>/dev/null
+bash install-${SCRIPT_VER}.sh $MYSTIC_DIR &>/dev/null
 popd &>/dev/null
 msg_ok "Installing Multi Relay Chat Systemd Start/Stop Scripts and Service File"
 
@@ -389,7 +398,7 @@ msg_ok "Installing bbs.disconnected-by-peer.at Scripts Dependencies for ${APP}"
 
 msg_info "Installing DbP Cron/banip/unbanip Scripts"
 pushd /usr/local/src/mystic/mystic/dbp &>/dev/null
-bash install.sh $MYSTIC_DIR &>/dev/null
+bash install-${SCRIPT_VER}.sh $MYSTIC_DIR &>/dev/null
 popd &>/dev/null
 msg_ok "Installing DbP Cron/banip/unbanip Scripts"
 
@@ -410,7 +419,7 @@ msg_ok "Installing Fail2Ban Dependencies for ${APP}"
 
 msg_info "Installing Fail2Ban Scripts for ${APP}"
 pushd /usr/local/src/mystic/mystic/fail2ban &>/dev/null
-bash install.sh $MYSTIC_DIR &>/dev/null
+bash install-${SCRIPT_VER}.sh $MYSTIC_DIR &>/dev/null
 popd &>/dev/null
 msg_ok "Installing Fail2Ban Scripts for ${APP}"
 
@@ -442,7 +451,7 @@ msg_ok "Installing IpBan Dependencies for ${APP}"
 
 #msg_info "Installing Fail2Ban Scripts for ${APP}"
 #pushd /usr/local/src/mystic/mystic/ipban &>/dev/null
-#bash install.sh $MYSTIC_DIR &>/dev/null
+#bash install-${SCRIPT_VER}.sh $MYSTIC_DIR &>/dev/null
 #popd &>/dev/null
 #msg_ok "Installing Fail2Ban Scripts for ${APP}"
 
@@ -470,7 +479,7 @@ msg_ok "Installing DosEmu2 Dependencies for ${APP}"
 
 #msg_info "Installing DbP Cron/banip/unbanip Scripts"
 #pushd /usr/local/src/mystic/mystic/dbp &>/dev/null
-#bash install.sh $MYSTIC_DIR &>/dev/null
+#bash install-${SCRIPT_VER}.sh $MYSTIC_DIR &>/dev/null
 #popd &>/dev/null
 #msg_ok "Installing DbP Cron/banip/unbanip Scripts"
 
diff --git a/install.sh b/install.sh
index cb3e903..a00e249 100644
--- a/install.sh
+++ b/install.sh
@@ -12,9 +12,10 @@ CM="${GN}✓${CL}"
 APP="Mystic"
 MSDIR="/opt/mystic"
 TMP_DIR=$(mktemp -d)
-ARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-apt install lsb-release -y &>/dev/null
+apt install lsb-release dpkg-dev -y &>/dev/null
+
+ARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 DIST=$(lsb_release -i -s)
 CODENAME=$(lsb_release -c -s)
@@ -25,9 +26,9 @@ USER=$(getent shadow mystic)
 FAIL2BAN_GROUP=$(getent group fail2ban)
 IPBAN_GROUP=$(getent group ipban)
 
-
 LIBDIR=/usr/lib/${ARCH}
 MYSTIC_VER="112a48"
+SCRIPT_VER"v0"
 
 if [ "${ARCH}" = "x86_64-linux-gnu" ]; then
     INIMOD_ARCH="amd64"
@@ -262,7 +263,7 @@ msg_ok "Downloading ${APP} Systemd Start/Stop Scripts and Service File"
 
 msg_info "Installing ${APP} Systemd Start/Stop Scripts and Service File"
 pushd /usr/local/src/mystic/mystic/mis &>/dev/null
-bash install-v0.sh $MYSTIC_DIR &>/dev/null
+bash install-${SCRIPT_VER}.sh $MYSTIC_DIR &>/dev/null
 popd &>/dev/null
 msg_ok "Installing ${APP} Systemd Start/Stop Scripts and Service File"
 
@@ -328,7 +329,7 @@ msg_ok "Setting up Multi Relay Chat for ${APP}"
 
 msg_info "Installing Multi Relay Chat Systemd Start/Stop Scripts and Service File"
 pushd /usr/local/src/mystic/mystic/mrc &>/dev/null
-bash install-v0.sh $MYSTIC_DIR &>/dev/null
+bash install-${SCRIPT_VER}.sh $MYSTIC_DIR &>/dev/null
 popd &>/dev/null
 msg_ok "Installing Multi Relay Chat Systemd Start/Stop Scripts and Service File"
 
@@ -397,7 +398,7 @@ msg_ok "Installing bbs.disconnected-by-peer.at Scripts Dependencies for ${APP}"
 
 msg_info "Installing DbP Cron/banip/unbanip Scripts"
 pushd /usr/local/src/mystic/mystic/dbp &>/dev/null
-bash install-v0.sh $MYSTIC_DIR &>/dev/null
+bash install-${SCRIPT_VER}.sh $MYSTIC_DIR &>/dev/null
 popd &>/dev/null
 msg_ok "Installing DbP Cron/banip/unbanip Scripts"
 
@@ -418,7 +419,7 @@ msg_ok "Installing Fail2Ban Dependencies for ${APP}"
 
 msg_info "Installing Fail2Ban Scripts for ${APP}"
 pushd /usr/local/src/mystic/mystic/fail2ban &>/dev/null
-bash install-v0.sh $MYSTIC_DIR &>/dev/null
+bash install-${SCRIPT_VER}.sh $MYSTIC_DIR &>/dev/null
 popd &>/dev/null
 msg_ok "Installing Fail2Ban Scripts for ${APP}"
 
@@ -450,7 +451,7 @@ msg_ok "Installing IpBan Dependencies for ${APP}"
 
 #msg_info "Installing Fail2Ban Scripts for ${APP}"
 #pushd /usr/local/src/mystic/mystic/ipban &>/dev/null
-#bash install-v0.sh $MYSTIC_DIR &>/dev/null
+#bash install-${SCRIPT_VER}.sh $MYSTIC_DIR &>/dev/null
 #popd &>/dev/null
 #msg_ok "Installing Fail2Ban Scripts for ${APP}"
 
@@ -478,7 +479,7 @@ msg_ok "Installing DosEmu2 Dependencies for ${APP}"
 
 #msg_info "Installing DbP Cron/banip/unbanip Scripts"
 #pushd /usr/local/src/mystic/mystic/dbp &>/dev/null
-#bash install-v0.sh $MYSTIC_DIR &>/dev/null
+#bash install-${SCRIPT_VER}.sh $MYSTIC_DIR &>/dev/null
 #popd &>/dev/null
 #msg_ok "Installing DbP Cron/banip/unbanip Scripts"