FCL/sftools/dev/build: comparison imgtools/buildrom/tools/datadriveimage.pm

equal deleted inserted replaced

-:22486c9c7b15
+:378360dbbdba
 		return 0;
 	}
 	else
 	{
 		print "$source copied to $destfile\n" if($verboseOpt);
-		return $destfile;
+		return "\"".$destfile."\"";
 	}
 }
 # Make a check for sisfile keyword by reading the specified iby/oby file,
 # if sisfile keyword is found then push the respective image on to the respective array
 {
 	my($dir,$obyfile,$nonsisFileArray,$renameArray,$aliasArray,$hideArray,$verboseOpt,$keepgoingOpt) = @_;
 	open (OBEY ,$obyfile) or die($obyfile."\n");
 	while(my $line =<OBEY>)
 	{
-		if( $line =~ /^(file|data)\s*=\s*(\S+)\s+(\S+)/i )
+		if( $line =~ /^(file|data)\s*=\s*(\"[^"]+\")\s+(\"[^"]+\")/i ||
+				$line =~ /^(file|data)\s*=\s*(\"[^"]+\")\s+(\S+)/i ||
+				$line =~ /^(file|data)\s*=\s*(\S+)\s+(\"[^"]+\")/i ||
+				$line =~ /^(file|data)\s*=\s*(\S+)\s+(\S+)/i )
 		{
 			my $keyWord=$1;
 			my $source=$2;
 			my $dest=$3;
-			if( $source !~ /(\S+):(\S+)/ )
+			if( $source !~ /(\S+):([^"]+)/ )
 			{
 				$source = get_drive().$2;
 			}
 			my $var = &copyFilesToFolders( $source,$dest,$dir,$verboseOpt);
 			if($var)
 			{
-				$var = $keyWord."=".$var;
+				$line = $keyWord."=".$var."\t".$dest."\n";
-				$line =~ s/^(\S+)=(\S+)/$var/;
 				push(@$nonsisFileArray,$line);
 			}
 			else
 			{
 				exit(1)if(!$keepgoingOpt);