Merge pull request #1329 from ericmehl/clean-extraction-directory

installDependencies : Clean extraction directory

Author: johnhaddon

config/installDependencies.py

@@ -96,14 +96,13 @@
 	subprocess.check_output( "7z x %s -o%s -aoa -y" % ( archiveFileName, args.dependenciesDir ) )
 	# 7z (and zip extractors generally) don't have an equivalent of --strip-components=1
 	# Copy the files up one directory level to compensate
-	for p in glob.glob(
-		os.path.join(
-			args.dependenciesDir.replace( "/", "\\" ),
-			os.path.splitext( args.archiveURL.split( "/" )[-1] )[0],
-			"*"
-		)
-	):
+	extractedPath = os.path.join(
+		args.dependenciesDir.replace( "/", "\\" ),
+		os.path.splitext( args.archiveURL.split( "/" )[-1] )[0]
+	)
+	for p in glob.glob( os.path.join( extractedPath, "*" ) ):
 		shutil.move( p, args.dependenciesDir )
+	os.rmdir( extractedPath )
 
 # Remove all Cortex related files from the package, so there is no conflict
 # with the files generated by our build.