diff --git a/Install-SketchUp.ps1 b/Install-SketchUp.ps1 index c6b756e..44b0a2f 100644 --- a/Install-SketchUp.ps1 +++ b/Install-SketchUp.ps1 @@ -1,24 +1,20 @@ -# $InstallVersion must be set by the calling script or specified here -# Make sure we have an administrative token -If ( IsAdmin ) -{ - # Define URL for downloading the installer - $URL = "https://www.sketchup.com/sketchup/${InstallVersion}/SketchUpPro-exe" - - # Make sure the URL is valid before we do anything - If ( IsURLValid $URL ) - { - # TODO: Uninstall all versions of SketchUp - # 'SketchUp 2019', 'SketchUp 2021', 'SketchUp 2022', 'SketchUp 2023', 'SketchUp Viewer' | Uninstall-MSI +# This is the URL for retreving the latest version of the specified installer +# Trying to query this URL directly no longer works now that CloudFlare is blocking script access +# It does, however, work in the browser to retrieve the direct download link +# https://www.sketchup.com/sketchup/2023/SketchUpPro-exe - # Set the local file name to download to - $FILE = '{0}{1}.exe' -f (Get-TempPath),(Split-Path $URL -Leaf) +# Define URL for downloading the installer +$URL = 'https://download.sketchup.com/SketchUpStudio-2023-1-340-117.exe' - # Download installer - $FILE = Download-File -URL $URL -File $FILE +# TODO: Uninstall all versions of SketchUp +#'SketchUp 2019', 'SketchUp 2021', 'SketchUp 2022', 'SketchUp 2023', 'SketchUp Viewer' | Uninstall-MSI - # Install package - Install-Program -Path $FILE -Arguments "/silent" -Delete - } -} +# Set the local file name to download to +$FILE = '{0}{1}' -f (Get-TempPath),(Split-Path $URL -Leaf) + +# Download installer +$FILE = Download-File -URL $URL -File $FILE + +# Install package +Install-Program -Path $FILE -Arguments "/silent" -Delete \ No newline at end of file