diff --git a/dosemu2/info-v6.sh b/dosemu2/info-v6.sh index 0523703..19d5a9e 100644 --- a/dosemu2/info-v6.sh +++ b/dosemu2/info-v6.sh @@ -1,4 +1,4 @@ -if [ $DOSEMU = "Yes" ]; then +if [ $DOSEMU = "dosemu2" ]; then echo "" >> ${DBP_INFO} echo "DosEmu2 Integration with Mystic" >> ${DBP_INFO} echo "" >> ${DBP_INFO} @@ -6,3 +6,13 @@ echo "For the correct DosEmu2 integration follow the Mystic Doors doc ${MYSTIC_D echo "" >> ${DBP_INFO} echo "==============================================================================================================" >> ${DBP_INFO} fi + +if [ $DOSEMU = "dosemu" ]; then +echo "" >> ${DBP_INFO} +echo "DosEmu Integration with Mystic" >> ${DBP_INFO} +echo "" >> ${DBP_INFO} +echo "For the correct DosEmu integration follow the Mystic Doors doc ${MYSTIC_DIR}/docs/unix.install.txt" >> ${DBP_INFO} +echo "" >> ${DBP_INFO} +echo "==============================================================================================================" >> ${DBP_INFO} +fi + diff --git a/dosemu2/install-v6.sh b/dosemu2/install-v6.sh index 6c9a5bf..ad08a0c 100644 --- a/dosemu2/install-v6.sh +++ b/dosemu2/install-v6.sh @@ -1,4 +1,4 @@ -if [ $DOSEMU = "Yes" ]; then +if [ $DOSEMU = "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 @@ -10,3 +10,17 @@ apt install -y dosemu2 &>/dev/null msg_ok "Installing DosEmu2 Dependencies for ${APP}" fi + +if [ $DOSEMU = "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 +apt update &>/dev/null +apt install -y dosemu &>/dev/null +#apt install -y install-otherdos &>/dev/null + +msg_ok "Installing DosEmu Dependencies for ${APP}" + +fi + diff --git a/dosemu2/prompt-v6.sh b/dosemu2/prompt-v6.sh index f9427e7..a446af1 100644 --- a/dosemu2/prompt-v6.sh +++ b/dosemu2/prompt-v6.sh @@ -1,8 +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 \ +DOSEMU=$(whiptail --title "Add DosEmu2/DosEmu to Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \ + "Yes" "Add DosEmu2/DosEmu Support" ON \ + "No" "Don't add DosEmu2/DosEmu Support" OFF \ 3>&1 1>&2 2>&3) exitstatus=$? if [ $exitstatus = 0 ]; then - echo -e "${DGN}Add DbP Script: ${BGN}$DOSEMU${CL}" + echo -e "${DGN}Add DosEmu2/DosEmu Support: ${BGN}$DOSEMU${CL}" fi diff --git a/install-next.sh b/install-next.sh index 20cb1bd..3fd3d5d 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="yes" + DOSEMU="dosemu2" elif [ "${ARCH}" = "i386-linux-gnu" ]; then INIMOD_ARCH="amd32" MYSTIC_ARCH="l32" MYSTIC_EXT="rar" RARLAB="rar" - DOSEMU="no" + DOSEMU="dosemu" elif [ "${ARCH}" = "aarch64-linux-gnu" ]; then INIMOD_ARCH="arm64" MYSTIC_ARCH="p64" MYSTIC_EXT="zip" RARLAB="" - DOSEMU="yes" + DOSEMU="dosemu2" elif [ "${ARCH}" = "arm-linux-gnueabihf" ]; then INIMOD_ARCH="arm32" MYSTIC_ARCH="p32" MYSTIC_EXT="zip" RARLAB="" - DOSEMU="no" + DOSEMU="" else echo "Architecture not supported: ${ARCH}" exit 1 @@ -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 [ "$DOSEMU" = "yes" ]; then +if [ ! -z "$DOSEMU" ]; 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 [ "$DOSEMU" = "yes" ]; then +if [ ! -z "$DOSEMU" ]; 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 [ "$DOSEMU" = "yes" ]; then +if [ ! -z "$DOSEMU" ]; then source $MSTEMPDIR/mystic/dosemu2/info-${SCRIPT_VER}.sh fi