Update UE version, remove duplicated code

razekmaiden · Dec 30, 2020 · 931662c · 931662c
1 parent e9f95a7
commit 931662c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 23 deletions.
diff --git a/install_run_all.sh b/install_run_all.sh
@@ -7,31 +7,14 @@ pushd "$SCRIPT_DIR"  >/dev/null
 set -e
 set -x
 
-#confirm unreal install directory
+# Get Unreal install directory
 UnrealDir=$1
 if [[ !(-z "UnrealDir") ]]; then
-	UnrealDir="$SCRIPT_DIR/UnrealEngine"
+    UnrealDir="$SCRIPT_DIR/UnrealEngine"
 fi
 
-read -p "Unreal will be installed in $UnrealDir. To change it invoke script with path argument. Continue? " -n 1 -r
-echo
-if [[ ! $REPLY =~ ^[Yy]$ ]]
-then
-	popd >/dev/null
-    exit 0
-fi
-
-#install unreal
-if [[ !(-d "$UnrealDir") ]]; then
-	git clone -b 4.24 https://github.com/EpicGames/UnrealEngine.git "$UnrealDir"
-	pushd "$UnrealDir" >/dev/null
-
-	./Setup.sh
-	./GenerateProjectFiles.sh
-	make
-
-	popd >/dev/null
-fi
+# Install Unreal Engine
+./install_unreal.sh $1
 
 #install airsim
 ./setup.sh

diff --git a/install_unreal.sh b/install_unreal.sh
@@ -18,12 +18,12 @@ echo
 if [[ ! $REPLY =~ ^[Yy]$ ]]
 then
 	popd >/dev/null
-    exit 0
+    exit 1                      # Exit code 1 so that install_run_all.sh will not proceed further
 fi
 
 #install unreal
 if [[ !(-d "$UnrealDir") ]]; then
-	git clone -b 4.24 https://github.com/EpicGames/UnrealEngine.git "$UnrealDir"
+	git clone -b 4.25 https://github.com/EpicGames/UnrealEngine.git "$UnrealDir"
 	pushd "$UnrealDir" >/dev/null
 
 	./Setup.sh