Tools Rework and version bump

hhocker · hhocker · commit 139d2a1d831d · 2019-02-26T00:08:45.000-06:00
Android Studio to v3.3.1. Reworked the tools to get rid of the need for the LessMSI download and now uses a special bootstrap exe to get 7zip
diff --git a/AndroidStudioPortable-Definitions.ps1 b/AndroidStudioPortable-Definitions.ps1
@@ -14,32 +14,37 @@
         will be untouched.
  #>
 
+ #Settings folder for Android Studio 
 $PortabelHomeDirectoryName =
     'portable-home'
 $PortableHomeDirectory =
     ".\$PortabelHomeDirectoryName"
 
+#Locations of Android SDK downloads
 $AndroidSDKDirectory =
     ".\android-sdk-windows"
 $AndroidSDKBinariesDirectories = @(
     "$AndroidSDKDirectory\tools",
     "$AndroidSDKDirectory\platform-tools"
 )
 
+## Android Studio 
 $AndroidStudio =
-    'android-studio-ide-181.5056338-windows'
+    'android-studio-ide-182.5264788-windows'
 $AndroidStudioArchive =
     "$AndroidStudio.zip"
+#URL changes based on version above
 $AndroidStudioURL =
-    "https://dl.google.com/dl/android/studio/ide-zips/3.2.1.0/$AndroidStudioArchive"
+    "https://dl.google.com/dl/android/studio/ide-zips/3.3.1.0/$AndroidStudioArchive"
+## Autogenerated from above
 $AndroidStudioDirectory =
     ".\$AndroidStudio\android-studio"
 $AndroidStudioBinariesDirectory =
     "$AndroidStudioDirectory\bin"
 $AndroidStudioUserHomeDirectory =
     "`${idea.home}/../../$PortabelHomeDirectoryName"
 $AndroidStudioHomeDirectory =
-    "$AndroidStudioUserHomeDirectory/.AndroidStudio3.1"
+    "$AndroidStudioUserHomeDirectory/.AndroidStudio"
 $AndroidStudioExecutable =
     'studio64.exe'
 $AndroidStudioConfigurationFile =
@@ -62,52 +67,49 @@ $AndroidStudioBatchFile =
 $GradleUserHomeDirectory =
     "$PortableHomeDirectory\.gradle"
 
-$OracleJDK =
-    'jdk-8u181-windows-x64'
-$OracleJDKInstaller =
-    "$OracleJDK.exe"
-$OracleJDKURL =
-    "http://download.oracle.com/otn-pub/java/jdk/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/$OracleJDKInstaller"
-$OracleJDKdlCookie =
-    "Cookie: oraclelicense=accept-securebackup-cookie"
-$OracleJDKInternalCABPath =
-    '.rsrc\1033\JAVA_CAB10'
-$OracleJDKInternalCAB =
-    '111'
-$OracleJDKInternalArchive =
-    'tools.zip'
-$OracleJDKDirectory =
-    ".\$OracleJDK"
-$OracleJDKBinariesDirectory =
-    "$OracleJDKDirectory\bin"
+## OpenJDK Java binaries 
+$OpenJDK =
+    'OpenJDK8U-jdk_x64_windows_hotspot_8u202b08'
+$OpenJDKName = 
+	'jdk8u202-b08'
+#Should Autogenerate from above	
+$OpenJDKArchive =
+    "$OpenJDK.zip"
+$OpenJDKURL =
+    "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/$OpenJDKName/$OpenJDKArchive"
+$OpenJDKDirectory =
+    ".\$OpenJDKName"
+$OpenJDKBinariesDirectory =
+"$OpenJDKDirectory\bin"
 
-$LessMSI =
-    'lessmsi-v1.6.1'
-$LessMSIArchive =
-    "$LessMSI.zip"
-$LessMSIURL =
-    'https://github.com/activescott/lessmsi/releases/download/v1.6.1/' +
-        $LessMSIArchive
-$LessMSIDirectory =
-    ".\$LessMSI"
-$LessMSIExecutable =
-    'lessmsi.exe'
+### Tools Section. Shouldnt need to change ##
 
+##7z File Expander
 $7z =
-    '7z1805-x64'
+    '7z1900-extra'
+	
+#Autgenerated from above
 $7zInstaller =
-    "$7z.msi"
+    "$7z.7z"
 $7zURL =
     "http://d.7-zip.org/a/$7zInstaller"
-$7zDirectory =
-    ".\$7z\SourceDir\Files\7-Zip"
 $7zExecutable =
-    '7z.exe'
-
+    '7za.exe'
+#$7zExtractFile =				
+#    "x64\$7zExecutable"	#64 bit version if desired
+$7zExtractFile =
+    "$7zExecutable"
+$7zBootStrapURL = 
+	'https://www.7-zip.org/a/7zr.exe'
+$7zBootStrapExec = 
+	'7zr.exe'
+	
+##Aria Downloader
 $aria2 =
     'aria2-1.34.0-win-64bit-build1'
 $aria2Archive =
     "$aria2.zip"
+##URL may need adjusted if newer version is used 
 $aria2URL =
     "https://github.com/aria2/aria2/releases/download/release-1.34.0/$aria2Archive"
 $aria2Directory =
diff --git a/Readme.md b/Readme.md
@@ -7,16 +7,12 @@ portable. To run the scripts you need PowerShell version 2.0 or higher.
 * __Setup-AndroidStudioPortable.ps1__
 
 	+ Downloads aria2 and unpacks its archive.
-    + Downloads lessmsi and unpacks its archive.
-    + Downloads 7-Zip and unpacks its installer with lessmsi.
-    + Downloads the Android SDK and unpacks its archive with 7-Zip as .Net
-      libraries can't handle long file names inside.
+    + Downloads 7zr to bootstrap extraction of 7-zip archives
+    + Downloads 7-Zip and unpacks its installer with 7zr.
     + Downloads Android Studio and unpacks its archive.
     + Downloads the Oracle JDK installer and unpacks it with 7-Zip.
     + Unpacks `.pack` files in the JDK directory into `.jar` files with
       the unpack200 utility bundled with the JDK.
-    + Removes all aria2, lessmsi and 7-Zip files with the SDK, Studio, and JDK
-      archives and installers.
     + Generates a batch file to start an Android Studio instance without
       PowerShell.
 
@@ -39,10 +35,15 @@ portable. To run the scripts you need PowerShell version 2.0 or higher.
         - Android Studio _bin_ directory
         - Android SDK _tools_ and _platform-tools_ directories
 
+* __Remove-SetupTemporaryFiles.ps1__
+
+    + Removes all aria2 and 7-Zip files then Studio and JDK
+      archives.
+		
 * __Remove-AndroidStudioPortable.ps1__
 
-    + Removes all aria2, lessmsi and 7-Zip files with the SDK, Studio, and JDK
-      archives and installers.
+    + Removes all aria2 and 7-Zip files then Studio and JDK
+      archives.
     + Removes the unpacked SDK, Studio, and JDK directories but leaves the
       portable home directory along.
 
diff --git a/Remove-AndroidStudioPortable.ps1 b/Remove-AndroidStudioPortable.ps1
@@ -1,4 +1,4 @@
-﻿#Requires -Version 2.0
+#Requires -Version 2.0
 
 <#
     .SYNOPSIS
@@ -19,34 +19,10 @@
 . '.\AndroidStudioPortable-Helpers.ps1'
 
 #
-# Remove temporary files.
+# Cleanup Tools
 #
+. '.\Remove-SetupTemporaryFiles.ps1'
 
-$aria2RootDirectory =
-    Get-RelativeRootDirectory -RelativePath $aria2Directory
-$LessMSIRootDirectory =
-    Get-RelativeRootDirectory -RelativePath $LessMSIDirectory
-$7zRootDirectory =
-    Get-RelativeRootDirectory -RelativePath $7zDirectory
-
-$TemporaryFiles = @(
-	$aria2Archive,
-	$aria2RootDirectory,
-    $LessMSIArchive,
-    $LessMSIRootDirectory,
-    $7zInstaller,
-    $7zRootDirectory,
-    $AndroidSDKArchive,
-    $AndroidStudioArchive,
-    $OracleJDKInstaller,
-    $OracleJDKInternalArchive
-)
-
-$RemoveItemParameters = @{
-    Path = $TemporaryFiles;
-    ErrorAction = 'SilentlyContinue';
-}
-Remove-Item @RemoveItemParameters -Recurse -Force
 
 #
 # Remove installed packages.
diff --git a/Remove-SetupTemporaryFiles.ps1 b/Remove-SetupTemporaryFiles.ps1
@@ -0,0 +1,22 @@
+#
+# Remove temporary files.
+#
+$aria2RootDirectory = 
+    Get-RelativeRootDirectory -RelativePath $aria2Directory
+
+$TemporaryFiles = @(
+	$aria2Archive,
+    $aria2RootDirectory,
+    $7zBootStrapExec,
+    $7zInstaller,
+    $7zExecutable,
+    $AndroidStudioArchive,
+    $OracleJDKInstaller,
+	$OracleJDKInternalArchive
+)
+
+$RemoveItemParameters = @{
+    Path = $TemporaryFiles;
+    ErrorAction = 'SilentlyContinue';
+}
+Remove-Item @RemoveItemParameters -Recurse -Force
diff --git a/Setup-AndroidStudioPortable.ps1 b/Setup-AndroidStudioPortable.ps1
@@ -29,8 +29,7 @@
 #
 
 #
-# Download and unpack lessmsi to be able to unpack
-# a 7-Zip installer later.
+# 0. Check to see if we need to download anything
 #
 
 $ToolsAreRequired =
@@ -48,32 +47,22 @@ if ($ToolsAreRequired -And !(Test-Path -Path $aria2Directory))
     Write-Output "Expand Aria2"
     Expand-Archive -Path $aria2Archive
 }
-	
-if ($ToolsAreRequired -And !(Test-Path -Path $LessMSIDirectory))
-{
-    if (!(Test-Path -Path $LessMSIArchive))
-    {
-        Write-Output "Get LessMSI"
-        & ".\$aria2Directory\$aria2Executable" -o $LessMSIArchive $LessMSIURL
-    }
-    Write-Output "Expand LessMSI"
-    Expand-Archive -Path $LessMSIArchive
-}
 
 #
-# Download and unpack the 7-Zip installer.
+# Download and unpack the 7-Zip archive and bootstrap extractor.
 #
 
-if ($ToolsAreRequired -And !(Test-Path -Path $7zDirectory))
+if ($ToolsAreRequired -And !(Test-Path -Path $7zExecutable))
 {
     if (!(Test-Path -Path $7zInstaller))
     {
         Write-Output "Get 7-Zip"
-        & ".\$aria2Directory\$aria2Executable" -o $7zInstaller $7zURL
+		& ".\$aria2Directory\$aria2Executable" --file-allocation=none  -o $7zBootStrapExec $7zBootStrapURL
+        & ".\$aria2Directory\$aria2Executable" --file-allocation=none -o $7zInstaller $7zURL
     }
 
-    Write-Output "Use LessMSI to unpack 7zip"
-    & ".\$LessMSIDirectory\$LessMSIExecutable" 'x' $7zInstaller
+    Write-Output "Use 7zr to unpack 7zip"
+    & ".\$7zBootStrapExec" 'e' $7zInstaller '-bso0' '-bsp1' '-y' $7zExtractFile
 }
 
 #
@@ -82,14 +71,14 @@ if ($ToolsAreRequired -And !(Test-Path -Path $7zDirectory))
 
 if (!(Test-Path -Path $AndroidStudioDirectory))
 {
-    if (!(Test-Path -Path $AndroidStudioArchive))
+    if (!(Test-Path -Path $AndroidStudioArchive) -or (Test-Path -Path "$AndroidStudioArchive.aria2"))
     {
         Write-Output "Download Android Studio $AndroidStudio"
-        & ".\$aria2Directory\$aria2Executable" -c -o $AndroidStudioArchive $AndroidStudioURL 
+        & ".\$aria2Directory\$aria2Executable" --file-allocation=none -c -o $AndroidStudioArchive $AndroidStudioURL 
     }
 
     Write-Output "Unpacking Android Studio"
-    & ".\$7zDirectory\$7zExecutable" 'x' $AndroidStudioArchive '-o*' '-y'
+    & ".\$7zExecutable" 'x' $AndroidStudioArchive '-o*' '-bso0' '-bsp1' '-y'
 }
 
 #
@@ -220,33 +209,9 @@ foreach ($VMConfigurationFile in $AndroidStudioVMConfigurationFiles)
 }
 
 #
-# Remove temporary files.
+# Cleanup Tools
 #
-$aria2RootDirectory = 
-    Get-RelativeRootDirectory -RelativePath $aria2Directory
-$LessMSIRootDirectory =
-    Get-RelativeRootDirectory -RelativePath $LessMSIDirectory
-$7zRootDirectory =
-    Get-RelativeRootDirectory -RelativePath $7zDirectory
-
-$TemporaryFiles = @(
-	$aria2Archive,
-    $aria2RootDirectory,
-    $LessMSIArchive,
-    $LessMSIRootDirectory,
-    $7zInstaller,
-    $7zRootDirectory,
-    $AndroidStudioArchive,
-    $OracleJDKInstaller,
-    $OracleJDKInternalCAB,
-    $OracleJDKInternalArchive
-)
-
-$RemoveItemParameters = @{
-    Path = $TemporaryFiles;
-    ErrorAction = 'SilentlyContinue';
-}
-Remove-Item @RemoveItemParameters -Recurse -Force
+. '.\Remove-SetupTemporaryFiles.ps1'
 
 #
 # Generate a batch file to start Android Studio.

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@`
`29`	`29`	`#`
`30`	`30`
`31`	`31`	`#`
`32`		`-# Download and unpack lessmsi to be able to unpack`
`33`		`-# a 7-Zip installer later.`
	`32`	`+# 0. Check to see if we need to download anything`
`34`	`33`	`#`
`35`	`34`
`36`	`35`	`$ToolsAreRequired =`
`@@ -48,32 +47,22 @@ if ($ToolsAreRequired -And !(Test-Path -Path $aria2Directory))`
`48`	`47`	`Write-Output "Expand Aria2"`
`49`	`48`	`Expand-Archive -Path $aria2Archive`
`50`	`49`	`}`
`51`		`-`
`52`		`-if ($ToolsAreRequired -And !(Test-Path -Path $LessMSIDirectory))`
`53`		`-{`
`54`		`- if (!(Test-Path -Path $LessMSIArchive))`
`55`		`- {`
`56`		`- Write-Output "Get LessMSI"`
`57`		`- & ".\$aria2Directory\$aria2Executable" -o $LessMSIArchive $LessMSIURL`
`58`		`- }`
`59`		`- Write-Output "Expand LessMSI"`
`60`		`- Expand-Archive -Path $LessMSIArchive`
`61`		`-}`
`62`	`50`
`63`	`51`	`#`
`64`		`-# Download and unpack the 7-Zip installer.`
	`52`	`+# Download and unpack the 7-Zip archive and bootstrap extractor.`
`65`	`53`	`#`
`66`	`54`
`67`		`-if ($ToolsAreRequired -And !(Test-Path -Path $7zDirectory))`
	`55`	`+if ($ToolsAreRequired -And !(Test-Path -Path $7zExecutable))`
`68`	`56`	`{`
`69`	`57`	`if (!(Test-Path -Path $7zInstaller))`
`70`	`58`	`{`
`71`	`59`	`Write-Output "Get 7-Zip"`
`72`		`- & ".\$aria2Directory\$aria2Executable" -o $7zInstaller $7zURL`
	`60`	`+ & ".\$aria2Directory\$aria2Executable" --file-allocation=none -o $7zBootStrapExec $7zBootStrapURL`
	`61`	`+ & ".\$aria2Directory\$aria2Executable" --file-allocation=none -o $7zInstaller $7zURL`
`73`	`62`	`}`
`74`	`63`
`75`		`- Write-Output "Use LessMSI to unpack 7zip"`
`76`		`- & ".\$LessMSIDirectory\$LessMSIExecutable" 'x' $7zInstaller`
	`64`	`+ Write-Output "Use 7zr to unpack 7zip"`
	`65`	`+ & ".\$7zBootStrapExec" 'e' $7zInstaller '-bso0' '-bsp1' '-y' $7zExtractFile`
`77`	`66`	`}`
`78`	`67`
`79`	`68`	`#`
`@@ -82,14 +71,14 @@ if ($ToolsAreRequired -And !(Test-Path -Path $7zDirectory))`
`82`	`71`
`83`	`72`	`if (!(Test-Path -Path $AndroidStudioDirectory))`
`84`	`73`	`{`
`85`		`- if (!(Test-Path -Path $AndroidStudioArchive))`
	`74`	`+ if (!(Test-Path -Path $AndroidStudioArchive) -or (Test-Path -Path "$AndroidStudioArchive.aria2"))`
`86`	`75`	`{`
`87`	`76`	`Write-Output "Download Android Studio $AndroidStudio"`
`88`		`- & ".\$aria2Directory\$aria2Executable" -c -o $AndroidStudioArchive $AndroidStudioURL`
	`77`	`+ & ".\$aria2Directory\$aria2Executable" --file-allocation=none -c -o $AndroidStudioArchive $AndroidStudioURL`
`89`	`78`	`}`
`90`	`79`
`91`	`80`	`Write-Output "Unpacking Android Studio"`
`92`		`- & ".\$7zDirectory\$7zExecutable" 'x' $AndroidStudioArchive '-o*' '-y'`
	`81`	`+ & ".\$7zExecutable" 'x' $AndroidStudioArchive '-o*' '-bso0' '-bsp1' '-y'`
`93`	`82`	`}`
`94`	`83`
`95`	`84`	`#`
`@@ -220,33 +209,9 @@ foreach ($VMConfigurationFile in $AndroidStudioVMConfigurationFiles)`
`220`	`209`	`}`
`221`	`210`
`222`	`211`	`#`
`223`		`-# Remove temporary files.`
	`212`	`+# Cleanup Tools`
`224`	`213`	`#`
`225`		`-$aria2RootDirectory =`
`226`		`- Get-RelativeRootDirectory -RelativePath $aria2Directory`
`227`		`-$LessMSIRootDirectory =`
`228`		`- Get-RelativeRootDirectory -RelativePath $LessMSIDirectory`
`229`		`-$7zRootDirectory =`
`230`		`- Get-RelativeRootDirectory -RelativePath $7zDirectory`
`231`		`-`
`232`		`-$TemporaryFiles = @(`
`233`		`- $aria2Archive,`
`234`		`- $aria2RootDirectory,`
`235`		`- $LessMSIArchive,`
`236`		`- $LessMSIRootDirectory,`
`237`		`- $7zInstaller,`
`238`		`- $7zRootDirectory,`
`239`		`- $AndroidStudioArchive,`
`240`		`- $OracleJDKInstaller,`
`241`		`- $OracleJDKInternalCAB,`
`242`		`- $OracleJDKInternalArchive`
`243`		`-)`
`244`		`-`
`245`		`-$RemoveItemParameters = @{`
`246`		`- Path = $TemporaryFiles;`
`247`		`- ErrorAction = 'SilentlyContinue';`
`248`		`-}`
`249`		`-Remove-Item @RemoveItemParameters -Recurse -Force`
	`214`	`+. '.\Remove-SetupTemporaryFiles.ps1'`
`250`	`215`
`251`	`216`	`#`
`252`	`217`	`# Generate a batch file to start Android Studio.`