tmpdir variable renamed to download_dir

Author: Megaf

flightgear_compiler

@@ -51,7 +51,7 @@ export PATH="/usr/lib/ccache:${PATH}"
 # Directory where everything will be installed at.
 installdir="$HOME/FlightGear"
 # Directory where the source codes will be downloaded to.
-tempdir="/tmp/FlightGear_Sources"
+download_dir="/tmp/FlightGear_Sources"
 # Temporary directory where cmake will run from.
 buildir="/dev/shm/FlightGear_Compiler_Output"
 version="$(cat VERSION)"
@@ -87,7 +87,7 @@ clear
 # Now the script will run cmake and make and make install for each component.
 echo ""
 echo "#====== Compiling OpenSceneGraph."
-cd $buildir/OSG && cmake $tempdir/OSG -DCMAKE_BUILD_TYPE="$buildtype" -DOpenGL_GL_PREFERENCE=LEGACY -DCMAKE_CXX_FLAGS_RELEASE="$cflags" -DCMAKE_C_FLAGS_RELEASE="$cflags" -DCMAKE_INSTALL_PREFIX=$installdir
+cd $buildir/OSG && cmake $download_dir/OSG -DCMAKE_BUILD_TYPE="$buildtype" -DOpenGL_GL_PREFERENCE=LEGACY -DCMAKE_CXX_FLAGS_RELEASE="$cflags" -DCMAKE_C_FLAGS_RELEASE="$cflags" -DCMAKE_INSTALL_PREFIX=$installdir
 make -j $ncores && echo "#====== Installing OpenSceneGraph." && make install && rm -rf $buildir/OSG
 
 echo ""
@@ -96,7 +96,7 @@ echo "#====== you have all dependencies required."
 
 echo ""
 echo "#====== Compiling PLIB."
-cd $buildir/PLIB && cmake $tempdir/PLIB -DCMAKE_BUILD_TYPE="$buildtype" -DOpenGL_GL_PREFERENCE=LEGACY -DCMAKE_CXX_FLAGS_RELEASE="$cflags" -DCMAKE_C_FLAGS_RELEASE="$cflags" -DCMAKE_INSTALL_PREFIX=$installdir
+cd $buildir/PLIB && cmake $download_dir/PLIB -DCMAKE_BUILD_TYPE="$buildtype" -DOpenGL_GL_PREFERENCE=LEGACY -DCMAKE_CXX_FLAGS_RELEASE="$cflags" -DCMAKE_C_FLAGS_RELEASE="$cflags" -DCMAKE_INSTALL_PREFIX=$installdir
 make -j $ncores && echo "#====== Installing PLIB." && make install&& rm -rf $buildir/PLIB
 
 echo ""
@@ -105,14 +105,14 @@ echo "#====== you have all dependencies required."
 
 echo ""
 echo "#====== Compiling SimGear."
-cd $buildir/SimGear && cmake $tempdir/SimGear -DCMAKE_BUILD_TYPE="$buildtype"  -DBUILD_TESTING=OFF -DENABLE_TESTS=OFF -DENABLE_SIMD_CODE=ON -DENABLE_SIMD=ON -DCMAKE_CXX_FLAGS_RELEASE="$cflags" -DCMAKE_C_FLAGS_RELEASE="$cflags" -DCMAKE_INSTALL_PREFIX=$installdir
+cd $buildir/SimGear && cmake $download_dir/SimGear -DCMAKE_BUILD_TYPE="$buildtype"  -DBUILD_TESTING=OFF -DENABLE_TESTS=OFF -DENABLE_SIMD_CODE=ON -DENABLE_SIMD=ON -DCMAKE_CXX_FLAGS_RELEASE="$cflags" -DCMAKE_C_FLAGS_RELEASE="$cflags" -DCMAKE_INSTALL_PREFIX=$installdir
 make -j $ncores && echo "#====== Installing SimGear." && make install&& rm -rf $buildir/SimGear
 echo "#====== If something went wrong when compiling SimGear then make sure"
 echo "#====== you have all dependencies required."
 
 echo ""
 echo "#====== Compiling FlightGear."
-cd $buildir/FlightGear && cmake $tempdir/FlightGear -DCMAKE_BUILD_TYPE="$buildtype" -DSYSTEM_FLITE=OFF -DENABLE_AUTOTESTING=OFF -DENABLE_SIMD=ON -DCMAKE_CXX_FLAGS_RELEASE="$cflags" -DCMAKE_C_FLAGS_RELEASE="$cflags" -DCMAKE_INSTALL_PREFIX=$installdir
+cd $buildir/FlightGear && cmake $download_dir/FlightGear -DCMAKE_BUILD_TYPE="$buildtype" -DSYSTEM_FLITE=OFF -DENABLE_AUTOTESTING=OFF -DENABLE_SIMD=ON -DCMAKE_CXX_FLAGS_RELEASE="$cflags" -DCMAKE_C_FLAGS_RELEASE="$cflags" -DCMAKE_INSTALL_PREFIX=$installdir
 make -j $ncores && echo "#====== Installing FlightGear." && make install && rm -rf $buildir/FlightGear
 
 echo ""

flightgear_downloader

@@ -46,7 +46,7 @@
 # the OpenSceneGraph, PLIB, SimGear libraries and
 # FlightGear Flight Simulator.
 
-tempdir="/tmp/FlightGear_Sources" # Directory where the source codes will be downloaded to.
+download_dir="/tmp/FlightGear_Sources" # Directory where the source codes will be downloaded to.
 fgbranch="release/2020.3" # Branch for FlightHear
 sgbranch="release/2020.3" # Branch for SimGear
 osgbranch="OpenSceneGraph-3.6" # Branch for OpenSceneGraph
@@ -91,45 +91,45 @@ echo "#====== Downloading Source Codes Started."
 # Checking OpenSceneGraph
 echo ""
 echo "#====== Checking if OpenSceneGraph was already downloaded."
-if [ -d "$tempdir/OSG" ]; then
+if [ -d "$download_dir/OSG" ]; then
 echo "#======  OpenSceneGraph found, updating the repo if neded."
-cd $tempdir/OSG && git pull # Try to update existing previously cloned repo.
+cd $download_dir/OSG && git pull # Try to update existing previously cloned repo.
 else
 echo "#====== OpenSceneGraph not found, downloading now."
-git clone --depth=1 -b $osgbranch $osgurl $tempdir/OSG # Clone repo from Git
+git clone --depth=1 -b $osgbranch $osgurl $download_dir/OSG # Clone repo from Git
 fi
 
 # Checking PLIB
 echo ""
 echo "#====== Checking if PLIB was already downloaded."
-if [ -d "$tempdir/PLIB" ]; then
+if [ -d "$download_dir/PLIB" ]; then
 echo "#======  PLIB found, updating the repo if neded."
-cd $tempdir/PLIB && git pull # Try to update existing previously cloned repo.
+cd $download_dir/PLIB && git pull # Try to update existing previously cloned repo.
 else
 echo "#====== PLIB not found, downloading now."
-git clone --depth=1 https://git.code.sf.net/p/libplib/code $tempdir/PLIB # Clone repo from Git
+git clone --depth=1 https://git.code.sf.net/p/libplib/code $download_dir/PLIB # Clone repo from Git
 fi
 
 # Checking SimGear
 echo ""
 echo "#====== Checking if SimGear was already downloaded."
-if [ -d "$tempdir/SimGear" ]; then
+if [ -d "$download_dir/SimGear" ]; then
 echo "#======  SimGear found, updating the repo if neded."
-cd $tempdir/SimGear && git pull # Try to update existing previously cloned repo.
+cd $download_dir/SimGear && git pull # Try to update existing previously cloned repo.
 else
 echo "#====== SimGear not found, downloading now."
-git clone --depth=1 -b $fgbranch git://git.code.sf.net/p/flightgear/simgear $tempdir/SimGear # Clone repo from Git
+git clone --depth=1 -b $fgbranch git://git.code.sf.net/p/flightgear/simgear $download_dir/SimGear # Clone repo from Git
 fi
 
 # Checking FlightGear
 echo ""
 echo "#====== Checking if FlightGear was already downloaded."
-if [ -d "$tempdir/FlightGear" ]; then
+if [ -d "$download_dir/FlightGear" ]; then
 echo "#======  FlightGear found, updating the repo if neded."
-cd $tempdir/FlightGear && git pull # Try to update existing previously cloned repo.
+cd $download_dir/FlightGear && git pull # Try to update existing previously cloned repo.
 else
 echo "#====== FlightGear not found, downloading now."
-git clone --depth=1 -b $fgbranch git://git.code.sf.net/p/flightgear/flightgear $tempdir/FlightGear # Clone repo from Git
+git clone --depth=1 -b $fgbranch git://git.code.sf.net/p/flightgear/flightgear $download_dir/FlightGear # Clone repo from Git
 fi
 
 echo ""