oF script / linux downloader

Author: danoli3

scripts/dev/download_libs.sh

@@ -170,9 +170,9 @@ if [ "$ARCH" == "" ]; then
         if [ "$ARCH" == "x86_64" ]; then
         	ARCH=64
         elif [ "$ARCH" == "arm64" ]; then
-        	ARCH=64 # for now
+        	ARCH=arm64
        	elif [ "$ARCH" == "aarch64" ]; then
-       		ARCH=64 # for now
+       		ARCH=arm64
         elif [ "$ARCH" == "i686" ] || [ "$ARCH" == "i386" ]; then
             echo "32bit linux is not officially supported anymore but compiling the libraries using the build script in apothecary/scripts should compile all the dependencies without problem"
             exit 1
@@ -215,7 +215,7 @@ if [ "$PLATFORM" == "linux" ]; then
     elif [ "$ARCH" == "arm64" ]; then
 		OPT="_${GCC_VERSION}"
 	elif [ "$ARCH" == "aarch64" ]; then
-		OPT=""
+		OPT="_${GCC_VERSION}"
 	elif [ "$ARCH" == "armv8l" ]; then
 	    OPT=""
 	elif [ "$ARCH" == "armv7l" ]; then

scripts/of.sh

@@ -30,8 +30,8 @@ autoDetectOS() {
                 ;;
         esac
     else
-    	export OF_OS=$(${OF_PLATFORM} | tr '[:upper:]' '[:lower:]')
-    	export OF_ARCH=""
+        export OF_OS=$(${OF_PLATFORM} | tr '[:upper:]' '[:lower:]')
+        export OF_ARCH=""
     fi
 }
 
@@ -74,14 +74,14 @@ runCommand() {
             ;;
         update)
             echo "openFrameworks update"
-            SCRIPT="${OF_SCRIPT_PATH}/download_libs.sh"
+            SCRIPT="${OF_CORE_SCRIPT_DIR}/${OF_PLATFORM}/download_libs.sh"
             ;;
         upgrade)
             echo "openFrameworks upgrade"
             case "$SUBCMD" in
                 addons)
                     echo "Upgrading addons"
-                    SCRIPT="${OF_SCRIPT_PATH}/dev/upgrade.sh"
+                    SCRIPT="${OF_CORE_SCRIPT_DIR}/dev/upgrade.sh"
                     ;;
                 apps)
                     echo "Upgrading apps"
@@ -91,7 +91,7 @@ runCommand() {
                         echo "Upgrade cancelled. No changes were made."
                         exit 0
                     fi
-                    SCRIPT="${OF_SCRIPT_PATH}/dev/upgrade.sh"
+                    SCRIPT="${OF_CORE_SCRIPT_DIR}/dev/upgrade.sh"
                     ;;
                 *)
                     echo "Unknown upgrade action: $SUBCMD"