File tree Expand file tree Collapse file tree 1 file changed +13
-4
lines changed Expand file tree Collapse file tree 1 file changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -3576,16 +3576,25 @@ public static IEnumerable<string> GetFindFilePaths()
3576
3576
return GetFindFilePathsRaw ( ) . Distinct ( ) ;
3577
3577
}
3578
3578
3579
+ static string GetAssemblyPath ( Assembly assy ) {
3580
+ if ( assy == null || String . IsNullOrEmpty ( assy . Location ) ) {
3581
+ return null ;
3582
+ }
3583
+
3584
+ return Path . GetDirectoryName ( assy . Location ) ;
3585
+ }
3586
+
3579
3587
static IEnumerable < string > GetFindFilePathsRaw ( )
3580
3588
{
3581
3589
yield return System . Environment . CurrentDirectory ;
3582
3590
yield return Path . Combine ( System . Environment . CurrentDirectory , "bin" ) ;
3583
3591
yield return Directory . GetCurrentDirectory ( ) ;
3584
- yield return Path . GetDirectoryName ( typeof ( RT ) . Assembly . Location ) ;
3585
3592
3586
- Assembly assy = Assembly . GetEntryAssembly ( ) ;
3587
- if ( assy != null )
3588
- yield return Path . GetDirectoryName ( assy . Location ) ;
3593
+ string assyPath ;
3594
+ assyPath = GetAssemblyPath ( typeof ( RT ) . Assembly ) ;
3595
+ if ( assyPath != null ) yield return assyPath ;
3596
+ assyPath = GetAssemblyPath ( Assembly . GetEntryAssembly ( ) ) ;
3597
+ if ( assyPath != null ) yield return assyPath ;
3589
3598
3590
3599
string rawpaths = ( string ) System . Environment . GetEnvironmentVariable ( ClojureLoadPathString ) ;
3591
3600
if ( rawpaths == null )
You can’t perform that action at this time.
0 commit comments