Cleanup scripts

Author: blaquewithaq

build.ps1

@@ -90,7 +90,7 @@ function Start-Build {
         Read-LibsToDest -Source $Build\Release -Destination $Dist -RequiredLibs $RequiredBuildLibs
 
         $RequiredExternalLibs = @("projectM-4.dll")
-        Read-LibsToDest -Source $Env:PROJECTM_ROOT\lib -Destination $Dist -RequiredLibs $RequiredExternalLibs
+        Read-LibsToDest -Source $Env:PROJECTM_ROOT\bin -Destination $Dist -RequiredLibs $RequiredExternalLibs
     }
     else {
         Write-Host "Build failed!"

build.sh

@@ -1,6 +1,18 @@
 #!/bin/bash
 set -e
 
+# Set variables based on OS
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    LIB_EXT="so"
+    VIDEO_SINK="xvimagesink"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+    LIB_EXT="dylib"
+    VIDEO_SINK="osxvideosink"
+else
+    echo "Unsupported OS!"
+    exit 1
+fi
+
 # ------------
 # FUNCTIONS
 
@@ -52,10 +64,8 @@ build() {
     cmake --build "$1" --config "Release" --parallel
 
     # Move to dist
-    if [ -f "$1/libgstprojectm.so" ] ; then
-        mv "$1/libgstprojectm.so" "$2"
-    elif [ -f "$1/libgstprojectm.dylib" ] ; then
-        mv "$1/libgstprojectm.dylib" "$2"
+    if [ -f "$1/libgstprojectm.$LIB_EXT" ] ; then
+        mv "$1/libgstprojectm.$LIB_EXT" "$2"
     else
         echo "Build failed!"
         exit 1
@@ -65,7 +75,7 @@ build() {
 # Prompt user to install build
 prompt_install() {
     # Install to gstreamer plugin, if found
-    if [ -f "$2/libgstprojectm.so" ] || [ -f "$2/libgstprojectm.dylib" ]; then
+    if [ -f "$2/libgstprojectm.$LIB_EXT" ]; then
         if [ "$1" = false ] ; then
             echo
             echo -n "Install to gstreamer plugins? (Y/n): "
@@ -79,10 +89,8 @@ prompt_install() {
             mkdir -p "$HOME/.local/share/gstreamer-1.0/plugins/"
 
             # Move the file to the destination, overwriting if it exists
-            if [ -f "$2/libgstprojectm.so" ] ; then
-                mv "$2/libgstprojectm.so" "$HOME/.local/share/gstreamer-1.0/plugins/"
-            elif [ -f "$2/libgstprojectm.dylib" ] ; then
-                mv "$2/libgstprojectm.dylib" "$HOME/.local/share/gstreamer-1.0/plugins/"
+            if [ -f "$2/libgstprojectm.$LIB_EXT" ] ; then
+                mv "$2/libgstprojectm.$LIB_EXT" "$HOME/.local/share/gstreamer-1.0/plugins/"
             else
                 echo "Install failed!"
                 exit 1
@@ -91,11 +99,11 @@ prompt_install() {
             # Print example command
             echo
             echo "Done! Here's an example command:"
-            echo 'gst-launch-1.0 audiotestsrc ! queue ! audioconvert ! projectm ! "video/x-raw,width=512,height=512,framerate=60/1" ! videoconvert ! xvimagesink sync=false'
+            echo "gst-launch-1.0 audiotestsrc ! queue ! audioconvert ! projectm ! "video/x-raw,width=512,height=512,framerate=60/1" ! videoconvert ! $VIDEO_SINK sync=false"
         else
             echo
             echo "Done!"
-            echo 'You can install the plugin manually by moving <dist/libgstprojectm.so> to <$HOME/.local/share/gstreamer-1.0/plugins/libgstprojectm.so>'
+            echo "You can install the plugin manually by moving <dist/libgstprojectm.$LIB_EXT> to <$HOME/.local/share/gstreamer-1.0/plugins/libgstprojectm.$LIB_EXT>"
         fi
     else
         echo "Install failed!"

test.sh

@@ -1,3 +1,18 @@
+#!/bin/bash
+set -e
+
+# Set variables based on OS
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    LIB_EXT="so"
+    VIDEO_SINK="xvimagesink"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+    LIB_EXT="dylib"
+    VIDEO_SINK="osxvideosink"
+else
+    echo "Unsupported OS!"
+    exit 1
+fi
+
 # Check if gst-inspect-1.0 is installed
 if ! command -v gst-inspect-1.0 > /dev/null 2>&1; then
     echo "gst-inspect-1.0 is not installed. Please install it and try again."
@@ -11,8 +26,8 @@ if ! command -v gst-launch-1.0 > /dev/null 2>&1; then
 fi
 
 # Check if plugin is installed
-if [ ! -f "$HOME/.local/share/gstreamer-1.0/plugins/libgstprojectm.so" ] && [ ! -f "$HOME/.local/share/gstreamer-1.0/plugins/libgstprojectm.dylib" ]; then
-    echo "libgstprojectm.so is missing. Please install it and try again."
+if [ ! -f "$HOME/.local/share/gstreamer-1.0/plugins/libgstprojectm.$LIB_EXT" ]; then
+    echo "libgstprojectm.$LIB_EXT is missing. Please install it and try again."
     exit 1
 fi
 
@@ -37,14 +52,14 @@ case "$1" in
         GST_DEBUG=projectm:5 gst-launch-1.0 -v \
             audiotestsrc ! queue ! audioconvert ! \
             projectm \
-            ! "video/x-raw,width=512,height=512,framerate=60/1" ! videoconvert ! xvimagesink sync=false
+            ! "video/x-raw,width=512,height=512,framerate=60/1" ! videoconvert ! $VIDEO_SINK sync=false
         ;;
 
     "--preset")
         GST_DEBUG=4 gst-launch-1.0 -v \
             audiotestsrc ! queue ! audioconvert ! \
             projectm preset="test/presets/250-wavecode.milk.milk" \
-            ! "video/x-raw,width=512,height=512,framerate=60/1" ! videoconvert ! xvimagesink sync=false
+            ! "video/x-raw,width=512,height=512,framerate=60/1" ! videoconvert ! $VIDEO_SINK sync=false
         ;;
 
     "--properties")
@@ -62,7 +77,7 @@ case "$1" in
             mesh-size="512,512" \
             easter-egg=0.75 \
             preset-locked=false \
-            ! "video/x-raw,width=512,height=512,framerate=30/1" ! videoconvert ! xvimagesink sync=false
+            ! "video/x-raw,width=512,height=512,framerate=30/1" ! videoconvert ! $VIDEO_SINK sync=false
         ;;
 
     "--output-video")