From 0452a021c242fd56be64f7e675c7cdfa41694f4a Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Thu, 16 May 2024 17:02:36 +0200
Subject: [PATCH] Add dosbox for i386

---
 dosemu2/info-v6.sh    |  7 +++++--
 dosemu2/install-v6.sh |  8 +++++---
 install-next.sh       | 16 ++++++++--------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/dosemu2/info-v6.sh b/dosemu2/info-v6.sh
index 2a62217..46576dc 100644
--- a/dosemu2/info-v6.sh
+++ b/dosemu2/info-v6.sh
@@ -1,4 +1,6 @@
-if [ "$DOSEMU" == "dosemu2" ]; then
+
+if [ "${DOSEMU}" = "Yes" ]; then
+if [ "${DOSEMUVER}" = "dosemu2" ]; then
 echo "" >> ${DBP_INFO}
 echo "DosEmu2 Integration with Mystic" >> ${DBP_INFO}
 echo "" >> ${DBP_INFO}
@@ -7,7 +9,7 @@ echo "" >> ${DBP_INFO}
 echo "==============================================================================================================" >> ${DBP_INFO}
 fi
 
-if [ "$DOSEMU" == "dosemu" ]; then
+if [ "${DOSEMUVER}" = "dosemu" ]; then
 echo "" >> ${DBP_INFO}
 echo "DosEmu Integration with Mystic" >> ${DBP_INFO}
 echo "" >> ${DBP_INFO}
@@ -16,3 +18,4 @@ echo "" >> ${DBP_INFO}
 echo "==============================================================================================================" >> ${DBP_INFO}
 fi
 
+fi
diff --git a/dosemu2/install-v6.sh b/dosemu2/install-v6.sh
index dc88b3a..6121162 100644
--- a/dosemu2/install-v6.sh
+++ b/dosemu2/install-v6.sh
@@ -1,4 +1,5 @@
-if [ "$DOSEMU" == "dosemu2" ]; then
+if [ "${DOSEMU}" = "Yes" ]; then
+if [ "${DOSEMUVER}" = "dosemu2" ]; then
 msg_info "Installing DosEmu2 Dependencies for ${APP}"
 pushd $MSTEMPDIR &>/dev/null
 curl 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6d9cd73b401a130336ed0a56ebe1b5ded2ad45d6' | tee /etc/apt/trusted.gpg.d/code.launchpad.net-dosemu2.asc &>/dev/null
@@ -11,11 +12,11 @@ msg_ok "Installing DosEmu2 Dependencies for ${APP}"
 
 fi
 
-if [ "$DOSEMU" == "dosemu" ]; then
+if [ "${DOSEMUVER}" = "dosemu" ]; then
 msg_info "Installing DosEmu Dependencies for ${APP}"
 pushd $MSTEMPDIR &>/dev/null
 curl 'https://deb.freexian.com/extended-lts/archive-key.gpg' | tee /etc/apt/trusted.gpg.d/freexian-archive-extended-lts.gpg &>/dev/null
-echo "deb http://deb.freexian.com/extended-lts stretch contrib" | tee /etc/apt/sources.list.d/dosemu.list &>/dev/null
+echo "deb http://deb.freexian.com/extended-lts stretch main contrib" | tee /etc/apt/sources.list.d/stretch.list &>/dev/null
 apt update &>/dev/null
 apt install -y dosemu &>/dev/null
 #apt install -y install-otherdos &>/dev/null
@@ -24,3 +25,4 @@ msg_ok "Installing DosEmu Dependencies for ${APP}"
 
 fi
 
+fi
\ No newline at end of file
diff --git a/install-next.sh b/install-next.sh
index d8aa1b4..7157644 100644
--- a/install-next.sh
+++ b/install-next.sh
@@ -83,25 +83,25 @@ if [ "${ARCH}" = "x86_64-linux-gnu" ]; then
     MYSTIC_ARCH="l64"
     MYSTIC_EXT="rar"
     RARLAB="rar"
-    DOSEMU="dosemu2"
+    DOSEMUVER="dosemu2"
 elif [ "${ARCH}" = "i386-linux-gnu" ]; then
     INIMOD_ARCH="amd32"
     MYSTIC_ARCH="l32"
     MYSTIC_EXT="rar"
     RARLAB="rar"
-    DOSEMU="dosemu"
+    DOSEMUVER="dosemu"
 elif [ "${ARCH}" = "aarch64-linux-gnu" ]; then
     INIMOD_ARCH="arm64"
     MYSTIC_ARCH="p64"
     MYSTIC_EXT="zip"
     RARLAB=""
-    DOSEMU="dosemu2"
+    DOSEMUVER="dosemu2"
 elif [ "${ARCH}" = "arm-linux-gnueabihf" ]; then
     INIMOD_ARCH="arm32"
     MYSTIC_ARCH="p32"
     MYSTIC_EXT="zip"
     RARLAB=""
-    DOSEMU=""
+    DOSEMUVER=""
 else
     echo "Architecture not supported: ${ARCH}"
     exit 1
@@ -172,7 +172,7 @@ source $MSTEMPDIR/mystic/dbp/prompt-${SCRIPT_VER}.sh
 # Add Fail2ban | banip
 source $MSTEMPDIR/mystic/fail2ban/prompt-${SCRIPT_VER}.sh
 # Add Dosemu2
-if [ -n "$DOSEMU" ]; then
+if [ -n "${DOSEMUVER}" ]; then
 source $MSTEMPDIR/mystic/dosemu2/prompt-${SCRIPT_VER}.sh
 fi
 
@@ -195,7 +195,7 @@ source $MSTEMPDIR/mystic/dbp/install-${SCRIPT_VER}.sh
 # Add Fail2ban | banip
 source $MSTEMPDIR/mystic/fail2ban/install-${SCRIPT_VER}.sh
 # Add Dosemu2
-if [ -n "$DOSEMU" ]; then
+if [ -n "${DOSEMUVER}" ]; then
 source $MSTEMPDIR/mystic/dosemu2/install-${SCRIPT_VER}.sh
 fi
 
@@ -218,7 +218,7 @@ source $MSTEMPDIR/mystic/dbp/config-${SCRIPT_VER}.sh
 # Add Fail2ban | banip
 source $MSTEMPDIR/mystic/fail2ban/config-${SCRIPT_VER}.sh
 # Add Dosemu2
-if [ -n "$DOSEMU" ]; then
+if [ -n "${DOSEMUVER}" ]; then
 source $MSTEMPDIR/mystic/dosemu2/config-${SCRIPT_VER}.sh
 fi
 
@@ -250,7 +250,7 @@ source $MSTEMPDIR/mystic/dbp/info-${SCRIPT_VER}.sh
 # Add Fail2ban | banip
 source $MSTEMPDIR/mystic/fail2ban/info-${SCRIPT_VER}.sh
 # Add Dosemu2
-if [ -n "$DOSEMU" ]; then
+if [ -n "${DOSEMUVER}" ]; then
 source $MSTEMPDIR/mystic/dosemu2/info-${SCRIPT_VER}.sh
 fi