diff scripts/run_pd_libpd.sh @ 439:e49ae69acbe8 prerelease

Rebuilt run_pd_libpd.sh. Minor fixes, adjusted verbosity

--- a/scripts/run_pd_libpd.sh	Sat Jun 18 02:25:48 2016 +0100
+++ b/scripts/run_pd_libpd.sh	Sat Jun 18 04:19:17 2016 +0100
@@ -14,40 +14,47 @@
 
 usage()
 {
-    THIS_SCRIPT=`basename "$0"`
-    echo "Usage: $THIS_SCRIPT [-c command-line-args] [-nfF] <directory-with-source-files>"
-    echo "
-    This script copies a PureData project to the BeagleBone and runs it 
-    using libpd. The Bela-libpd executable should have first been copied
-    to the $BBB_LIBPD_EXECUTABLE_PATH folder on the Beaglebone.
-    The source directory should contain a file called _main.pd, which is the 
-    patch that will be loaded into Pd. All the content of the folder is 
-    recursively copied and the folder structure is flattened.
-    If the argument -n is passed, the output will not be run after compiling.
-    The -c option passes command-line arguments to the Bela program; 
-    enclose the argument string in quotes.
+	THIS_SCRIPT=`basename "$0"`
+	echo "Usage: $THIS_SCRIPT [-c 'command-line-args'] [-nfb] <directory-with-source-files>"
+	echo "
+	This script copies a PureData project to the BeagleBone and runs it 
+	using libpd. The Bela-libpd executable should have first been copied
+	to the $BBB_LIBPD_EXECUTABLE_PATH folder on the Beaglebone.
+	The source directory should contain a file called _main.pd, which is the 
+	patch that will be loaded into Pd. All the content of the folder is 
+	recursively copied and the folder structure is flattened.
 	
-    The -f argument runs the project in the foreground of the current terminal,
-    within a screen session that can be detached later with ctrl-A ctrl-D.
-    The -F argument runs the project in the foreground of the current terminal,
-    without screen, so	the output can be piped to another destination."
+	If the argument -n is passed, the output will not be run after copying the files.
+	
+	The -c option passes command-line arguments to the Bela program; 
+	enclose the argument string in quotes.
+	
+	The -b argument runs the projet in the background, so that no output is displayed
+	in the terminal.
+	The -f argument runs the project in the foreground of the current terminal,
+	without screen, so the output can be piped to another destination."
 }
 
 OPTIND=1
 
-while getopts "b:c:nfFh" opt; do
-    case $opt in
-        c)            COMMAND_ARGS=$OPTARG
-                      ;;
-		f)            RUN_IN_FOREGROUND=1
-			          ;;
-		F)            RUN_WITHOUT_SCREEN=1
-			  		  ;;
-        n)    	      RUN_PROJECT=0
-                      ;;
-        h|\?)         usage
-                      exit 1
-    esac
+while getopts "bc:nfFh" opt; do
+	case $opt in
+	c)
+		COMMAND_ARGS=$OPTARG
+	;;
+	b)
+		RUN_IN_FOREGROUND=0
+	;;
+	f)
+		RUN_WITHOUT_SCREEN=1
+	;;
+	n)
+		RUN_PROJECT=0
+	;;
+	h|\?)
+		usage
+		exit 1
+	esac
 done
 
 shift $((OPTIND-1))
@@ -55,53 +62,17 @@
 # Check that we have a directory containing at least one source file
 # as an argument
 
-if [ -z "$1" ]
+ADDITIONAL_FOLDER=$1
+
+if [ -z "$ADDITIONAL_FOLDER" ]
 then
-    usage
-    exit
-fi
-
-FIND_STRING="find $* -maxdepth 10000 -type f "
-
-PROJECT_FILES=$($FIND_STRING)
-
-if [[ -z $PROJECT_FILES ]]
-then
-    echo "Please provide a directory containing the _main.pd file and additional abstractions"
-    usage
-    exit
-fi
-
-# Stop Bela and clean out old source files
-echo "Stopping Bela and removing old source files..."
-ssh -t -t $BBB_ADDRESS "screen -X -S Bela quit &>/dev/null;\
- pkill Bela ; rm -rf $BBB_LIBPD_PROJECT_PATH/; mkdir -p $BBB_LIBPD_PROJECT_PATH; "
-
-# Copy new source files to the board
-echo "Copying new pd projects to BeagleBone..."
-scp $PROJECT_FILES "$BBB_ADDRESS:$BBB_LIBPD_PROJECT_PATH"
-
-if [ $? -ne 0 ]
-then
-	echo "Error while copying files"
+	usage
 	exit
 fi
 
-# Make new Bela executable and run
-if [ $RUN_PROJECT -eq 0 ]
-then
-    echo "Files copied. Run without \"-n\" to run the project"
-else
-    echo "Running project..."
-	
-	if [ $RUN_WITHOUT_SCREEN -ne 0 ]
-	then
-		ssh -t $BBB_ADDRESS "cd $BBB_LIBPD_PROJECT_PATH && $BBB_LIBPD_EXECUTABLE_PATH $COMMAND_ARGS"
-	elif [ $RUN_IN_FOREGROUND -eq 0 ]
-	then
-	    ssh $BBB_ADDRESS "cd $BBB_LIBPD_PROJECT_PATH && screen -S Bela -d -m \
-         $BBB_LIBPD_EXECUTABLE_PATH $COMMAND_ARGS"
-	else
-	    ssh -t $BBB_ADDRESS "cd $BBB_LIBPD_PROJECT_PATH && screen -S Bela $BBB_LIBPD_EXECUTABLE_PATH $COMMAND_ARGS"
-	fi
-fi
+#reconstruct the command line options 
+OPT=
+[ $RUN_IN_FOREGROUND -eq 0 ] && OPT="$OPT -b"
+[ $RUN_WITHOUT_SCREEN -eq 1 ] && OPT="$OPT -f"
+
+./build_project.sh -p libpd -r $ADDITIONAL_FOLDER $OPT -c "$COMMAND_ARGS" ../examples/basic_libpd/