@@ -104,25 +104,25 @@ private static Path getExtractPath(String filename, URL resource) {
104
104
105
105
String version = Version .getVersion ().replace (' ' , '-' );
106
106
107
- Path tempDirectory ;
108
107
Path root , file ;
109
108
110
109
// Temp directory with username in path
111
- tempDirectory = Paths .get (Configuration . SHARED_LIBRARY_EXTRACT_DIRECTORY . get ( "lwjgl" + System .getProperty ("user.name " )), version , filename );
112
- file = ( root = Paths .get (System .getProperty ("java.io.tmpdir " ))). resolve ( tempDirectory );
110
+ file = ( root = Paths .get (System .getProperty ("java.io.tmpdir " )))
111
+ . resolve ( Paths .get (Configuration . SHARED_LIBRARY_EXTRACT_DIRECTORY . get ( "lwjgl" + System .getProperty ("user.name " )), version , filename ) );
113
112
if (canWrite (root , file , resource )) {
114
113
return file ;
115
114
}
116
115
116
+ Path lwjgl_version_filename = Paths .get ("." + Configuration .SHARED_LIBRARY_EXTRACT_DIRECTORY .get ("lwjgl" ), version , filename );
117
+
117
118
// Working directory
118
- tempDirectory = Paths .get (Configuration .SHARED_LIBRARY_EXTRACT_DIRECTORY .get ("lwjgl" ), version , filename );
119
- file = (root = Paths .get ("" ).toAbsolutePath ()).resolve (tempDirectory );
119
+ file = (root = Paths .get ("" ).toAbsolutePath ()).resolve (lwjgl_version_filename );
120
120
if (canWrite (root , file , resource )) {
121
121
return file ;
122
122
}
123
123
124
124
// User home
125
- file = (root = Paths .get (System .getProperty ("user.home" ))).resolve (tempDirectory );
125
+ file = (root = Paths .get (System .getProperty ("user.home" ))).resolve (lwjgl_version_filename );
126
126
if (canWrite (root , file , resource )) {
127
127
return file ;
128
128
}
@@ -131,7 +131,7 @@ private static Path getExtractPath(String filename, URL resource) {
131
131
// C:\Windows\Temp
132
132
String env = System .getenv ("SystemRoot" );
133
133
if (env != null ) {
134
- file = (root = Paths .get (env , "Temp" )).resolve (tempDirectory );
134
+ file = (root = Paths .get (env , "Temp" )).resolve (lwjgl_version_filename );
135
135
if (canWrite (root , file , resource )) {
136
136
return file ;
137
137
}
@@ -140,7 +140,7 @@ private static Path getExtractPath(String filename, URL resource) {
140
140
// C:\Temp
141
141
env = System .getenv ("SystemDrive" );
142
142
if (env != null ) {
143
- file = (root = Paths .get (env + "/" )).resolve (Paths .get ("Temp" ).resolve (tempDirectory ));
143
+ file = (root = Paths .get (env + "/" )).resolve (Paths .get ("Temp" ).resolve (lwjgl_version_filename ));
144
144
if (canWrite (root , file , resource )) {
145
145
return file ;
146
146
}
0 commit comments