Fincer
/
openra-tibsunra2
mirror of https://github.com/Fincer/openra-tibsunra2
1
0
Fork 0
Code Issues 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Improve questions logic

master
Fincer 7 years ago
parent
8d76afbb22
commit
28e2922749
3 changed files with 65 additions and 32 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +31
    -18
      data/linux/openra-installscript.sh
  2. +6
    -0
      data/windows/install.ps1
  3. +28
    -14
      linux-install.sh

+ 31
- 18
data/linux/openra-installscript.sh View File

@ -49,7 +49,7 @@ elif [[ $DISTRO =~ $OPENSUSE ]]; then
PKG1_CHECK=$(rpm -qa openra | wc -l)
PKG2_CHECK=$(rpm -qa openra-playtest | wc -l)
PKG3_CHECK=$(rpm -qa openra-bleed | wc -l)
elif [[ $DISTRO =~ $FEDORA ]]; then
# Find out used Fedora version
@ -149,7 +149,7 @@ fi
echo -e "You are using $RELEASE.\n"
read -r -p "Do you want to continue? [y/N] " response
if [[ $response =~ ^([yY][eE][sS]|[yY])$ ]]; then
if [[ $(echo $response | sed 's/ //g') =~ ^([yY][eE][sS]|[yY])$ ]]; then
sleep 1
if [[ $DISTRO =~ $UBUNTU ]] || [[ $DISTRO =~ $DEBIAN ]]; then
@ -157,7 +157,20 @@ if [[ $response =~ ^([yY][eE][sS]|[yY])$ ]]; then
elif [[ $DISTRO =~ $OPENSUSE ]] || [[ $DISTRO =~ $FEDORA ]]; then
echo -e "\nAllright, let's continue. Do you want $bold_in\n\n1.$out manually check which OpenRA build dependencies (packages) will be installed on your system and manually install OpenRA after compilation? $dim_in(manual rpm packages installation)$bold_in\n2.$out automatically accept the installation of the OpenRA build dependencies during the script execution and automatically install OpenRA after compilation? $dim_in(automatic installation of rpm packages)$out\n"
fi
read -r -p "Please type 1 or 2 (Default: 2): " number
attempts=5
while [[ ! $(echo $number | sed 's/ //g') -eq 1 && ! $(echo $number | sed 's/ //g') -eq 2 ]]; do
attempts=$(($attempts -1))
if [[ $attempts -eq 0 ]]; then
echo -e "\nMaximum attempts reached. Aborting.\n"
break
fi
echo -e "\nInvalid answer. Expected number 1 or 2. Please type again ($attempts attempts left):\n"
read number
let number=$(echo $number | sed 's/ //g')
done
sleep 1
echo -e "\nDune 2 -- Question\n"
@ -171,7 +184,7 @@ if [[ $response =~ ^([yY][eE][sS]|[yY])$ ]]; then
echo -e "\nMore information about hotfixes: https://github.com/Fincer/openra-tibsunra2/#about-patches--hotfixes\n"
read -r -p "Use these hotfixes? [y/N] " hotfixes
if [[ $hotfixes =~ ^([yY][eE][sS]|[yY])$ ]]; then
if [[ $(echo $hotfixes | sed 's/ //g') =~ ^([yY][eE][sS]|[yY])$ ]]; then
echo -e "\nHotfixes applied. Continuing."
sleep 2
else
@ -179,7 +192,7 @@ if [[ $response =~ ^([yY][eE][sS]|[yY])$ ]]; then
sleep 2
fi
fi
if [[ $number -eq 1 ]]; then
METHOD=''
echo -e "\nSelected installation method:$bold_in Manual$out"
@ -196,14 +209,14 @@ if [[ $response =~ ^([yY][eE][sS]|[yY])$ ]]; then
if [[ $(find $WORKING_DIR/data/hotfixes/linux/ -type f -iname *.patch | wc -l) -eq 0 ]]; then
echo -e "Available hotfixes:$bold_in None$out"
else
if [[ $hotfixes =~ ^([yY][eE][sS]|[yY])$ ]]; then
if [[ $(echo $hotfixes | sed 's/ //g') =~ ^([yY][eE][sS]|[yY])$ ]]; then
echo -e "Use hotfixes:$bold_in Yes$out"
else
echo -e "Use hotfixes:$bold_in No$out"
fi
fi
if [[ ! $dune2_install =~ ^([nN][oO]|[nN])$ ]]; then
if [[ ! $(echo $dune2_install | sed 's/ //g') =~ ^([nN][oO]|[nN])$ ]]; then
echo -e "Install Dune 2:$bold_in Yes$out"
else
echo -e "Install Dune 2:$bold_in No$out"
@ -301,7 +314,7 @@ function sudocheck() {
## Once Red Alert 2 source files have been downloaded, move them to the OpenRA parent source directory.
## Add several missing directories for Red Alert 2.
if [[ ! $dune2_install =~ ^([nN][oO]|[nN])$ ]]; then
if [[ ! $(echo $dune2_install | sed 's/ //g') =~ ^([nN][oO]|[nN])$ ]]; then
echo -e "$bold_in\n2/7 ***Downloading OpenRA source code & Red Alert 2 + Dune 2 mod files from Github***\n$out"
else
echo -e "$bold_in\n2/7 ***Downloading OpenRA source code & Red Alert 2 mod files from Github***\n$out"
@ -332,7 +345,7 @@ function sudocheck() {
## Download the latest Dune 2 mod files from Github
## Once Dune 2 source files have been downloaded, move them to the OpenRA parent source directory.
if [[ ! $dune2_install =~ ^([nN][oO]|[nN])$ ]]; then
if [[ ! $(echo $dune2_install | sed 's/ //g') =~ ^([nN][oO]|[nN])$ ]]; then
echo -e "\nPart 3 (Dune 2 mod files):\n"
git clone -b master https://github.com/OpenRA/d2.git $HOME/openra-master/d2 && \
@ -343,7 +356,7 @@ function sudocheck() {
#*********************************************************************************************************
## Apply patches & hotfixes
if [[ ! $dune2_install =~ ^([nN][oO]|[nN])$ ]]; then
if [[ ! $(echo $dune2_install | sed 's/ //g') =~ ^([nN][oO]|[nN])$ ]]; then
#Copy all patch files excluding the one which modifies 'mods' string in the Linux Makefile (double patching it will cause conflicts between D2 and RA2)
cp ./data/patches/linux/*.patch $HOME/openra-master/
rm $HOME/openra-master/linux-ra2-make-modstrings.patch
@ -353,7 +366,7 @@ function sudocheck() {
rm $HOME/openra-master/linux-d2*.patch
fi
if [[ $hotfixes =~ ^([yY][eE][sS]|[yY])$ ]]; then
if [[ $(echo $hotfixes | sed 's/ //g') =~ ^([yY][eE][sS]|[yY])$ ]]; then
cp ./data/hotfixes/linux/*.patch $HOME/openra-master/
fi
@ -362,7 +375,7 @@ function sudocheck() {
#
## Patch several OpenRA source files (Makefile and such) for Tiberian Sun & Red Alert 2
if [[ ! $dune2_install =~ ^([nN][oO]|[nN])$ ]]; then
if [[ ! $(echo $dune2_install | sed 's/ //g') =~ ^([nN][oO]|[nN])$ ]]; then
echo -e "$bold_in\n3/7 ***Preparing OpenRA source files for Dune 2, Tiberian Sun & Red Alert 2***\n$out"
else
echo -e "$bold_in\n3/7 ***Preparing OpenRA source files for Tiberian Sun & Red Alert 2***\n$out"
@ -381,7 +394,7 @@ OPENRA_PKGVERSION=$(git ls-remote https://github.com/OpenRA/OpenRA.git | head -1
RA2_PKGVERSION=$(git ls-remote https://github.com/OpenRA/ra2.git | head -1 | sed "s/HEAD//" | sed 's/^\(.\{7\}\).*/\1/')
# Get version number for Dune 2 mod files if the mod is about to be installed (Github)
if [[ ! $dune2_install =~ ^([nN][oO]|[nN])$ ]]; then
if [[ ! $(echo $dune2_install | sed 's/ //g') =~ ^([nN][oO]|[nN])$ ]]; then
D2_VERSION=git-$(git ls-remote https://github.com/OpenRA/d2.git | head -1 | sed "s/HEAD//" | sed 's/^\(.\{7\}\).*/\1/')
@ -397,7 +410,7 @@ RA2_PKGVERSION=$(git ls-remote https://github.com/OpenRA/ra2.git | head -1 | sed
## Compile the game
##Change OpenRA version as it is in Github & change PACKAGE variable after that
if [[ ! $dune2_install =~ ^([nN][oO]|[nN])$ ]]; then
if [[ ! $(echo $dune2_install | sed 's/ //g') =~ ^([nN][oO]|[nN])$ ]]; then
PACKAGE_VERSION=$(echo $OPENRA_PKGVERSION$RA2_PKGVERSION$D2_PKGVERSION | sed 's/[A-Za-z]*//g') #Remove letters for dh_make
else
PACKAGE_VERSION=$(echo $OPENRA_PKGVERSION$RA2_PKGVERSION | sed 's/[A-Za-z]*//g') #Remove letters for dh_make
@ -405,13 +418,13 @@ RA2_PKGVERSION=$(git ls-remote https://github.com/OpenRA/ra2.git | head -1 | sed
mv $HOME/openra-master/$PACKAGE $HOME/openra-master/$PACKAGE-$PACKAGE_VERSION
PACKAGE=$PACKAGE_NAME-$PACKAGE_VERSION
if [[ ! $dune2_install =~ ^([nN][oO]|[nN])$ ]]; then
if [[ ! $(echo $dune2_install | sed 's/ //g') =~ ^([nN][oO]|[nN])$ ]]; then
echo -e "$bold_in\n4/7 ***Starting OpenRA compilation with Dune 2, Tiberian Sun & Red Alert 2***
$out"
else
echo -e "$bold_in\n4/7 ***Starting OpenRA compilation with Tiberian Sun & Red Alert 2***$out"
fi
sleep 2
if [[ $DISTRO =~ $UBUNTU ]] || [[ $DISTRO =~ $DEBIAN ]]; then
cd $HOME/openra-master/$PACKAGE && \
@ -427,7 +440,7 @@ RA2_PKGVERSION=$(git ls-remote https://github.com/OpenRA/ra2.git | head -1 | sed
rm $HOME/openra-master/$PACKAGE/mods/ra2/{.gitattributes,.gitignore,.travis.yml,build.cake,OpenRA.Mods.RA2.dll.mdb,make.cmd,make.ps1,makefile}
rm $HOME/openra-master/$PACKAGE/mods/ts/OpenRA.Mods.TS.dll.mdb
if [[ ! $dune2_install =~ ^([nN][oO]|[nN])$ ]]; then
if [[ ! $(echo $dune2_install | sed 's/ //g') =~ ^([nN][oO]|[nN])$ ]]; then
rm $HOME/openra-master/$PACKAGE/mods/d2/OpenRA.Mods.D2.dll.mdb
fi
@ -483,7 +496,7 @@ RA2_PKGVERSION=$(git ls-remote https://github.com/OpenRA/ra2.git | head -1 | sed
else
if [[ $number -eq 1 ]]; then
read -r -p "Install '$PACKAGE_NAME' now? [y/N] " response4
if [[ $response4 =~ ^([yY][eE][sS]|[yY])$ ]]; then
if [[ $(echo $response4 | sed 's/ //g') =~ ^([yY][eE][sS]|[yY])$ ]]; then
sudo dpkg -i $HOME/$PACKAGE_NAME*.deb
else
echo -e "\nPlease install '$PACKAGE_NAME' manually. You find the compiled package in '$HOME'."
@ -499,7 +512,7 @@ RA2_PKGVERSION=$(git ls-remote https://github.com/OpenRA/ra2.git | head -1 | sed
else
if [[ $number -eq 1 ]]; then
read -r -p "Install '$PACKAGE_NAME' now? [y/N] " response4
if [[ $response4 =~ ^([yY][eE][sS]|[yY])$ ]]; then
if [[ $(echo $response4 | sed 's/ //g') =~ ^([yY][eE][sS]|[yY])$ ]]; then
if [[ $DISTRO =~ $FEDORA ]]; then
sudo dnf $METHOD --best --allowerasing install $HOME/$PACKAGE_NAME*.rpm
elif [[ $DISTRO =~ $OPENSUSE ]]; then


+ 6
- 0
data/windows/install.ps1 View File

@ -49,6 +49,9 @@ If (Test-Path ".\data\hotfixes\windows\*.patch"){
$hotfixes = Read-Host "Use these hotfixes? (y/N)"
#Remove spaces if entered
$hotfixes = $hotfixes -replace '\s',''
if ($hotfixes -eq "y") {
"`nHotfixes applied. Continuing."
} else {
@ -62,6 +65,9 @@ If (Test-Path ".\data\hotfixes\windows\*.patch"){
$dune2_install = Read-Host "Additionally, Dune 2 can be installed, too. Do you want to install it? [y/N] (Default: y)"
#Remove spaces if entered
$dune2_install = $dune2_install -replace '\s',''
if (-Not ($dune2_install -eq "n") -and -Not ($dune2_install -eq "o")) {
"`nInstall Dune 2: Yes"
} else {


+ 28
- 14
linux-install.sh View File

@ -82,23 +82,34 @@ if [[ $DISTRO =~ "$ARCH" ]]; then
echo -e "\n$bold_in***Welcome Comrade*** $out\n"
echo -e "You are about to install OpenRA with Tiberian Sun & Red Alert 2 on Arch Linux.\n"
read -r -p "Do you want to continue? [y/N] " response
if [[ $response =~ ^([yY][eE][sS]|[yY])$ ]]; then
if [[ $(echo $response | sed 's/ //g') =~ ^([yY][eE][sS]|[yY])$ ]]; then
echo -e "\nAllright, let's continue. Do you want $bold_in\n\n1.$out manually install OpenRA after its compilation? $dim_in(manual pacman installation)$bold_in\n2.$out automatically install OpenRA after its compilation? $dim_in(pacman -U <compiled_openra_package>)$out\n"
read -r -p "Please type 1 or 2 (Default: 2): " number
sleep 1
attempts=5
while [[ ! $(echo $number | sed 's/ //g') -eq 1 && ! $(echo $number | sed 's/ //g') -eq 2 ]]; do
attempts=$(($attempts -1))
if [[ $attempts -eq 0 ]]; then
echo -e "\nMaximum attempts reached. Aborting.\n"
break
fi
echo -e "\nInvalid answer. Expected number 1 or 2. Please type again ($attempts attempts left):\n"
read number
let number=$(echo $number | sed 's/ //g')
done
sleep 1
rm $WORKING_DIR/data/linux/arch_linux/*.patch
echo -e "\nDune 2 -- Question\n"
read -r -p "Additionally, Dune 2 can be installed, too. Do you want to install it? [y/N] (Default: y) " dune2_install
if [[ ! $dune2_install =~ ^([nN][oO]|[nN])$ ]]; then
if [[ ! $(echo $dune2_install | sed 's/ //g') =~ ^([nN][oO]|[nN])$ ]]; then
#Copy all patch files excluding the one which modifies 'mods' string in the Linux Makefile (double patching it will cause conflicts between D2 and RA2)
cp ./data/patches/linux/*.patch ./data/linux/arch_linux/
rm ./data/linux/arch_linux/linux-ra2-make-modstrings.patch
else
else
#Copy all patch files excluding the ones for Dune 2.
cp ./data/patches/linux/*.patch ./data/linux/arch_linux/
rm ./data/linux/arch_linux/linux-d2*.patch
@ -111,9 +122,9 @@ if [[ $DISTRO =~ "$ARCH" ]]; then
echo -e $green_in$(find $WORKING_DIR/data/hotfixes/linux/ -type f -iname *.patch | sed -e 's/.*\///' -e 's/\.[^\.]*$//')$out
echo -e "\nMore information about hotfixes: https://github.com/Fincer/openra-tibsunra2/#about-patches--hotfixes\n"
read -r -p "Use these hotfixes? [y/N] " hotfixes
if [[ $hotfixes =~ ^([nN][oO][nN]|)$ ]]; then
if [[ $(echo $hotfixes | sed 's/ //g') =~ ^([nN][oO][nN]|)$ ]]; then
echo -e "\nHotfixes ignored and skipped. Continuing."
elif [[ $hotfixes =~ ^([yY][eE][sS]|[yY])$ ]]; then
elif [[ $(echo $hotfixes | sed 's/ //g') =~ ^([yY][eE][sS]|[yY])$ ]]; then
cp ./data/hotfixes/linux/*.patch ./data/linux/arch_linux/
echo -e "\nHotfixes applied. Continuing."
else
@ -130,14 +141,14 @@ if [[ $DISTRO =~ "$ARCH" ]]; then
if [[ $(find $WORKING_DIR/data/hotfixes/linux/ -type f -iname *.patch | wc -l) -eq 0 ]]; then
echo -e "Available hotfixes:$bold_in None$out"
else
if [[ $hotfixes =~ ^([yY][eE][sS]|[yY])$ ]]; then
if [[ $(echo $hotfixes | sed 's/ //g') =~ ^([yY][eE][sS]|[yY])$ ]]; then
echo -e "Use hotfixes:$bold_in Yes$out"
else
echo -e "Use hotfixes:$bold_in No$out"
fi
fi
if [[ ! $dune2_install =~ ^([nN][oO]|[nN])$ ]]; then
if [[ ! $(echo $dune2_install | sed 's/ //g') =~ ^([nN][oO]|[nN])$ ]]; then
echo -e "Install Dune 2:$bold_in Yes$out"
else
echo -e "Install Dune 2:$bold_in No$out"
@ -160,7 +171,7 @@ if [[ $DISTRO =~ "$ARCH" ]]; then
sed -i '//i '${PATCHES}')' $WORKING_DIR/data/linux/arch_linux/PKGBUILD
#Add Dune 2 to PKGBUILD if it is going to be installed
if [[ ! $dune2_install =~ ^([nN][oO]|[nN])$ ]]; then
if [[ ! $(echo $dune2_install | sed 's/ //g') =~ ^([nN][oO]|[nN])$ ]]; then
#Add Dune 2 sources (PKGBUILD -- source variable) -- Add Dune 2 git source
sed -i '/source=(/a "git:\/\/github.com\/OpenRA\/d2.git"' $WORKING_DIR/data/linux/arch_linux/PKGBUILD
@ -232,9 +243,12 @@ if [[ $DISTRO =~ "$ARCH" ]]; then
exit 1
fi
else
elif [[ $(echo $response | sed 's/ //g') =~ ^([nN][oO]|[nN])$ ]]; then
echo -e "\nCancelling OpenRA installation.\n"
exit 1
else
echo -e "\nNot a valid answer. Expected [y/N].\n\nCancelling OpenRA installation.\n"
exit 1
fi
fi
@ -261,7 +275,7 @@ if [[ $DISTRO =~ "$UBUNTU" ]] || [[ $DISTRO =~ "$DEBIAN" ]]; then
if [[ -d $HOME/openra-master ]]; then
echo -e "\n"
read -r -p "Found temporary OpenRA compilation files in $HOME. Remove them now? [y/N] " response2
if [[ $response2 =~ ^([yY][eE][sS]|[yY])$ ]]; then
if [[ $(echo $response2 | sed 's/ //g') =~ ^([yY][eE][sS]|[yY])$ ]]; then
echo -e "\nDeleting.\n"
rm -Rf $HOME/openra-master
fi
@ -296,7 +310,7 @@ if [[ $DISTRO =~ "$FEDORA" ]] || [[ $DISTRO =~ "$OPENSUSE" ]]; then
if [[ -d $HOME/openra-master ]]; then
echo -e "\n"
read -r -p "Found temporary OpenRA compilation files in $HOME. Remove them now? [y/N] " response3
if [[ $response3 =~ ^([yY][eE][sS]|[yY])$ ]]; then
if [[ $(echo $response3 | sed 's/ //g') =~ ^([yY][eE][sS]|[yY])$ ]]; then
echo -e "\nDeleting.\n"
rm -Rf $HOME/openra-master
fi


Write Preview
Loading…
Cancel
Save