Fixes related to exclude-from file selection
This commit is contained in:
		
							parent
							
								
									f882af77ff
								
							
						
					
					
						commit
						275593b0d4
					
				
							
								
								
									
										9
									
								
								osync.sh
								
								
								
								
							
							
						
						
									
										9
									
								
								osync.sh
								
								
								
								
							| 
						 | 
					@ -750,15 +750,18 @@ function RsyncExcludePattern
 | 
				
			||||||
 | 
					
 | 
				
			||||||
function RsyncExcludeFrom
 | 
					function RsyncExcludeFrom
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if [ ! $RSYNC_EXCLUDE_FROM == "" ] && [ -e $RSYNC_EXCLUDE_FROM ]
 | 
						if [ ! $RSYNC_EXCLUDE_FROM == "" ]
 | 
				
			||||||
	then
 | 
						then
 | 
				
			||||||
		## Check if the exclude list has a full path, and if not, add the config file path if there is one
 | 
							## Check if the exclude list has a full path, and if not, add the config file path if there is one
 | 
				
			||||||
		if [ "$(basename $RSYNC_EXCLUDE_FROM)" == "$RSYNC_EXCLUDE_FROM" ]
 | 
							if [ "$(basename $RSYNC_EXCLUDE_FROM)" == "$RSYNC_EXCLUDE_FROM" ]
 | 
				
			||||||
		then
 | 
							then
 | 
				
			||||||
			$RSYNC_EXCLUDE_FROM=$(dirname $cfgfile)/$RSYNC_EXCLUDE_FROM
 | 
								RSYNC_EXCLUDE_FROM=$(dirname $ConfigFile)/$RSYNC_EXCLUDE_FROM
 | 
				
			||||||
		fi
 | 
							fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		RSYNC_EXCLUDE="$RSYNC_EXCLUDE --exclude-from=\"$RSYNC_EXCLUDE_FROM\""
 | 
							if [ -e $RSYNC_EXCLUDE_FROM ]
 | 
				
			||||||
 | 
							then
 | 
				
			||||||
 | 
								RSYNC_EXCLUDE="$RSYNC_EXCLUDE --exclude-from=\"$RSYNC_EXCLUDE_FROM\""
 | 
				
			||||||
 | 
							fi
 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue