Update for recent Apple hardware

Source/Objects/Hardware/SBC/SBC Link/SBC_Link.m

@@ -460,7 +460,7 @@ - (void) installDriver:(NSString*)rootPwd
 								  passWord:passWord];
 		[driverScriptFileMover setVerbose:YES];
 		[driverScriptFileMover doNotMoveFilesToSentFolder];
-		[driverScriptFileMover setTransferType:eUseSCP];
+		[driverScriptFileMover setTransferType:eUseRSYNC];
 		[aSequence addTaskObj:driverScriptFileMover];
 
 		//since we made the task sequence the filemover's delegate, 
@@ -1240,7 +1240,7 @@ - (void) reloadClient
 							   passWord:passWord];
 		[SBCFileMover setVerbose:verbose];//TODO: was NO; for testing I would like to see this output; this takes the CB state from the GUI -tb-
 		[SBCFileMover doNotMoveFilesToSentFolder];
-		[SBCFileMover setTransferType:eUseSCP];
+		[SBCFileMover setTransferType:eUseRSYNC];
 		[aSequence addTaskObj:SBCFileMover];
 
 		//since we made the task sequence the filemover's delegate, 

Source/Objects/Misc Objects/FileCopy/ORFileMover.h

@@ -25,7 +25,8 @@ typedef enum _eFileTransferType {
 	eUseCURL	= 0,
 	eUseSCP 	= 1,
 	eUseSFTP 	= 2,
-	eUseFTP 	= 3
+	eUseFTP 	= 3,
+	eUseRSYNC	= 4
 }eFileTransferType;
 
 @interface ORFileMover : NSObject {

Source/Objects/Misc Objects/FileCopy/ORFileMover.m

@@ -326,6 +326,22 @@ -(void) doMove
 
                 case eUseCURL:
                     break;
+
+              case eUseRSYNC:
+ 				{
+					NSString* bp = [[NSBundle mainBundle ]resourcePath];
+					NSMutableString* theScript = [NSMutableString stringWithContentsOfFile:[bp stringByAppendingPathComponent:@"rsyncExpectScript"] encoding:NSASCIIStringEncoding error:nil];
+					[theScript replace:@"<isDir>" with:isDir?@"-r":@""];
+					[theScript replace:@"<verbose>" with:@""]; // High verbosity messes up the expect.
+					[theScript replace:@"<sourcePath>" with:[fullPath stringByReplacingOccurrencesOfString:@" " withString:@"\\ "]];
+					[theScript replace:@"<userName>" with:remoteUserName];
+					[theScript replace:@"<host>" with:remoteHost];
+					[theScript replace:@"<destinationPath>" with:tmpRemotePath];
+					[theScript replace:@"<password>" with:remotePassWord];
+					[theScript writeToFile:scriptPath atomically:YES encoding:NSASCIIStringEncoding error:nil];
+				}               
+                    break;                    
+
             }
 
             //make the script executable
@@ -422,6 +438,14 @@ - (void) taskCompleted: (NSNotification*)aNote
                         NSLog(@"task return status: %d\n",[task terminationStatus]);
                     }
 					break;
+
+                 case eUseRSYNC:
+					if([task terminationStatus] == 0)transferOK = YES;
+                    else {
+                        transferOK = NO;
+                        NSLog(@"task return status: %d\n",[task terminationStatus]);
+                    }
+					break;  
             }
         }
 
@@ -530,4 +554,4 @@ - (void) cleanSentFolder:(NSString*)dirPath
     [nc postNotificationName:ORFileMoverIsDoneNotification object:self];
 }
 
-@end
+@end

Source/Objects/Misc Objects/FileCopy/rsyncExpectScript

@@ -0,0 +1,26 @@
+#!/usr/bin/expect --
+# Use the "/usr/bin/expect -d --" to enable debuging output
+#
+set timeout -1
+spawn rsync -av  <verbose> <sourcePath>/ <userName>@<host>:<destinationPath>
+
+expect {
+  "assword:" {
+     send "<password>\n"
+     exp_continue
+  }
+  "yes/no" {
+     send "yes\n"
+     exp_continue
+  }
+  "done" {
+     #send_user "starting file transfer\n"
+  }
+  timeout { send_user "\nrsync time out\n" }
+  eof
+}
+expect eof
+
+# Wait for the result of the command; is the third element in the list
+catch wait result
+exit [lindex $result 3]