Linux script updates

Author: danoli3

scripts/linux/buildAllExamples.sh

@@ -2,9 +2,13 @@
 
 export LC_ALL=C
 
-for category in $( find ../../examples/ -maxdepth 1 -type d )
+OFDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+OFDIR="$(realpath "$OF_DIR/../..")"
+OFCORE_EXAMPLES_DIR="$(realpath "$OF_DIR/examples")"
+
+for category in $( find "${OFCORE_EXAMPLES_DIR}/" -maxdepth 1 -type d )
 do
-    if [ "$category" = "../../examples/android" -o "$category" = "../../examples/ios" -o "$category" = "../../examples/" -o "$category" = "../../examples/tvOS" ]; then
+    if [ "$category" = "${OFCORE_EXAMPLES_DIR}/android" -o "$category" = "${OFCORE_EXAMPLES_DIR}/ios" -o "$category" = "${OFCORE_EXAMPLES_DIR}/" -o "$category" = "${OFCORE_EXAMPLES_DIR}/tvOS" ]; then
         continue
     fi
 

scripts/linux/buildAllRPIExamples.sh

@@ -1,7 +1,12 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PARENT_DIR="$(dirname "$DIR")"
+
+OFDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+OFDIR="$(realpath "$OF_DIR/../..")"
+OFCORE_EXAMPLES_DIR="$(realpath "$OF_DIR/examples")"
+
 MAKEFILE_PATH=$PARENT_DIR/templates/linuxarmv6l/Makefile
-cd ${DIR}/../../examples
+cd ${OFCORE_EXAMPLES_DIR}
 
 for category in $(ls -1d *)
 do

scripts/linux/cleanAllExamples.sh

@@ -1,8 +1,12 @@
 #!/bin/bash
 
+OFDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+OFDIR="$(realpath "$OF_DIR/../..")"
+OFCORE_EXAMPLES_DIR="$(realpath "$OF_DIR/examples")"
+
 for category in $( find ../../examples/ -maxdepth 1 -type d )
 do
-    if [ "$category" = "../../examples/android" -o "$category" = "../../examples/ios" -o "$category" = "../../examples/" ]; then
+    if [ "$category" = "${OFCORE_EXAMPLES_DIR}/android" -o "$category" = "${OFCORE_EXAMPLES_DIR}/ios" -o "$category" = "${OFCORE_EXAMPLES_DIR}/" ]; then
         continue
     fi
 

scripts/linux/compileOF.sh

@@ -1,12 +1,20 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C
+OFDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+OFDIR="$(realpath "$OF_DIR/../..")"
 
 ARCH=$(uname -m)
-if [ "$ARCH" = "x86_64" ]; then
-        LIBSPATH=linux64
-else
-        LIBSPATH=linux
+if [ "$ARCH" == "" ]; then
+	if [ "$ARCH" = "x86_64" ]; then
+		LIBSPATH=linux/64
+	elif [ "$ARCH" = "arm64" ]; then
+		LIBSPATH=linux/arm64
+	elif [ "$ARCH" = "jetson" ]; then
+		LIBSPATH=linux/jetson
+	else
+		LIBSPATH=linux
+	fi
 fi
 
 pushd `dirname $0` > /dev/null
@@ -18,13 +26,13 @@ JOBS=1
 while getopts tj: opt ; do
 	case "$opt" in
 		t)  # testing, only build Debug
-		    BUILD="test" ;;
+			BUILD="test" ;;
 		j)  # make job count for parallel build
-		    JOBS="$OPTARG"
+			JOBS="$OPTARG"
 	esac
 done
 
-cd "${SCRIPTPATH}/../../libs/openFrameworksCompiled/project"
+cd "${OFDIR}/libs/openFrameworksCompiled/project"
 make -j$JOBS Debug
 exit_code=$?
 if [ $exit_code != 0 ]; then
@@ -34,11 +42,11 @@ if [ $exit_code != 0 ]; then
 fi
 
 if [ "$BUILD" == "install" ]; then
-    make -j$JOBS Release
-    exit_code=$?
-    if [ $exit_code != 0 ]; then
-      echo "there has been a problem compiling Release OF library"
-      echo "please report this problem in the forums"
-      exit $exit_code
-    fi
+	make -j$JOBS Release
+	exit_code=$?
+	if [ $exit_code != 0 ]; then
+	  echo "there has been a problem compiling Release OF library"
+	  echo "please report this problem in the forums"
+	  exit $exit_code
+	fi
 fi

scripts/linux/compilePG.sh

@@ -2,9 +2,11 @@
 
 export LC_ALL=C
 
-OF_ROOT=$(cd $(dirname $0)/../..; pwd -P)
+OFDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+OF_ROOT="$(realpath "$OF_DIR/../..")"
+OF_PG_DIR="$(realpath "$OF_DIR/apps/projectGenerator")"
 
-make Release -C ${OF_ROOT}/apps/projectGenerator/commandLine
+make Release -C ${OF_PG_DIR}/commandLine
 ret=$?
 if [ $ret -ne 0 ]; then
   echo "There has been a problem compiling the command line projectGenerator."
@@ -18,7 +20,7 @@ read -p "Do you want to install the command line project generator? [Y/n] " -r
 echo
 if [[ $REPLY =~ ^[Yy]$ ]]; then
     echo "To copy the command line project generator we need root permission."
-    sudo cp ${OF_ROOT}/apps/projectGenerator/commandLine/bin/projectGenerator /usr/local/bin/projectGenerator
+    sudo cp ${OF_PG_DIR}/commandLine/bin/projectGenerator /usr/local/bin/projectGenerator
     if [ ! $? -eq 0 ]; then
         echo "Failed to copy the projectGenerator file."
         exit

scripts/linux/removeFMOD.sh

@@ -1,3 +1,22 @@
-rm -r ../../libs/fmod
-rm ../../export/linux/libs/libfmod*
-rm ../../export/linux64/libs/libfmod*
+#!/bin/bash
+OFDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+OFDIR="$(realpath "$OF_DIR/../..")"
+
+if [ -d "${OFDIR}/libs/fmod" ]; then
+    rm -r "${OFDIR}/libs/fmod"
+    echo "Deleted ${OFDIR}/libs/fmod"
+fi
+
+if [ -d "${OFDIR}/export/linux/libs" ]; then
+	if ls ${OFDIR}/export/linux/libs/libfmod* 1> /dev/null 2>&1; then
+	    rm ${OFDIR}/export/linux/libs/libfmod*
+	    echo "Deleted files in ${OFDIR}/export/linux/libs/"
+	fi
+fi
+
+if [ -d "${OFDIR}/export/linux64/libs" ]; then
+	if ls ${OFDIR}/export/linux64/libs/libfmod* 1> /dev/null 2>&1; then
+	    rm ${OFDIR}/export/linux64/libs/libfmod*
+	    echo "Deleted files in ${OFDIR}/export/linux64/libs/"
+	fi
+fi

scripts/linux/testAllExamples.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 
 export LC_ALL=C
-cd ../../examples
+OFDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+OFDIR="$(realpath "$OF_DIR/../..")"
+OFCORE_EXAMPLES_DIR="$(realpath "$OF_DIR/examples")"
+
+cd ${OFCORE_EXAMPLES_DIR}
 
 for category in $( ls . )
 do
@@ -16,7 +20,7 @@ do
             continue
         fi    
         echo "-----------------------------------------------------------------"
-        echo "building " + $example
+        echo "building [" + $example "]"
         cd $example
         make Debug
         ret=$?
@@ -30,6 +34,7 @@ do
           echo error compiling $example
           exit
         fi
+        echo "build success [" + $example "]"
         cd bin
         ./$example
         cd ../../