Repository: flume Updated Branches: refs/heads/trunk 7962ce63b -> de6ecf485
FLUME-2881. Windows Launch Script fails in plugins dir code (Jonathan Smith via Roshan Naik) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/de6ecf48 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/de6ecf48 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/de6ecf48 Branch: refs/heads/trunk Commit: de6ecf48568761de829c8d8caf9bc41f9bf9e64c Parents: 7962ce6 Author: Roshan Naik <[email protected]> Authored: Wed Feb 17 14:11:44 2016 -0800 Committer: Roshan Naik <[email protected]> Committed: Wed Feb 17 14:25:49 2016 -0800 ---------------------------------------------------------------------- bin/flume-ng.ps1 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/de6ecf48/bin/flume-ng.ps1 ---------------------------------------------------------------------- diff --git a/bin/flume-ng.ps1 b/bin/flume-ng.ps1 index 8cdc331..4778717 100755 --- a/bin/flume-ng.ps1 +++ b/bin/flume-ng.ps1 @@ -319,10 +319,14 @@ if ("$pluginsPath" -eq "") { foreach($plugin in $pluginsPath.Split(";") ) { if ( Test-path "$plugin" ) { - $pluginTmp = - ( (Get-ChildItem "$plugin\*\lib") + (Get-ChildItem "$plugin\*\libext") ) -join "\*"";""" - if( "$pluginTmp" -ne "" ) { - $javaClassPath="$javaClassPath;""" + $pluginTmp + "\*"";" + $pluginTmp1 = (@(Get-ChildItem "$plugin\*\lib") -join "\*"";""") + if( "$pluginTmp1" -ne "" ) { + $javaClassPath="$javaClassPath;""" + $pluginTmp1 + "\*"";" + } + + $pluginTmp2 = (@(Get-ChildItem "$plugin\*\libext") -join "\*"";""") + if( "$pluginTmp2" -ne "" ) { + $javaClassPath="$javaClassPath;""" + $pluginTmp2 + "\*"";" } $javaLibraryPathTmp = (@(Get-ChildItem "$plugin\*\native") -join "\*"";""")
