comparison scripts/build_project.sh @ 275:428f13c2cb49 prerelease

build_project.sh fixed folder handling by rsync

 #    echo "Usage: $THIS_SCRIPT [directory-with-source-files]"
     usage
     exit
 fi
 
-BBB_PROJECT_FOLDER=$BBB_PROJECT_HOME"/"$BBB_PROJECT_NAME"/"
+BBB_PROJECT_FOLDER=$BBB_PROJECT_HOME"/"$BBB_PROJECT_NAME #make sure there is no trailing slash here
 BBB_NETWORK_TARGET_FOLDER=$BBB_ADDRESS:$BBB_PROJECT_FOLDER
 
 # Stop BeagleRT and clean out old source files
 echo "Stopping running program..."
 # sets the date, stops the running process

 
 #concatenate arguments to form path.
 HOST_SOURCE_PATH= #initially empty, will be filled with input arguments
 for i in "$@" #parse input arguments
 do
-  HOST_SOURCE_PATH+=" $1 "
+  HOST_SOURCE_PATH+=" $1"
   shift
   # Copy new souce files to the board
 done
 
 # Copy new source files to the board

     #and copy over all the files again and recompile them
     ssh bbb "make -C $BBB_BELA_HOME sourceclean PROJECT=$BBB_PROJECT_NAME";
     scp $HOST_SOURCE_PATH "$BBB_NETWORK_TARGET_FOLDER"
 else
     #rsync --delete makes sure it removes files that are not in the origin folder
-    rsync -av --delete-after --exclude=build $HOST_SOURCE_PATH "$BBB_NETWORK_TARGET_FOLDER"
+    rsync -av --delete-after --exclude=build $HOST_SOURCE_PATH"/" "$BBB_NETWORK_TARGET_FOLDER/" #trailing slashes used here make sure rsync does not create another folder inside the target folder
 fi;
 
 if [ $? -ne 0 ]
 then
 	echo "Error while copying files"