diff --git a/Chrome-Functions.ahk b/Chrome-Functions.ahk index 2d41252..e8d4948 100644 --- a/Chrome-Functions.ahk +++ b/Chrome-Functions.ahk @@ -338,7 +338,6 @@ CheckForChromeUpdates(ChromeFilepath := ""){ GetInstalledChromeFilepath(){ ; ChromeFilepath is global variable - if(ChromeFilepath = ""){ ChromePortableFilepath = %A_ScriptDir%\Lib\chrome-win64\chrome.exe @@ -355,15 +354,7 @@ GetInstalledChromeFilepath(){ SaveOrPostProgress(Message:=Message,PostType:="ErrorLoggingTextFile,DiscordErrorLogging") } else { - MsgBox 0x10, Chromium Portable not Found, Chromium Portable not found. `nPlease make sure it's located at one of the following paths and then try again.`n`n%ChromePortableFilepath% `nOR`n%ChromePortableFilepath2% - - - ; Leave this in for now, but i don't think we will be going to using the system Chrome in the future. - ; if(FileExist("C:\Program Files (x86)\Google\Chrome\Application\chrome.exe")) - ; ChromeFilepath = C:\Program Files (x86)\Google\Chrome\Application\chrome.exe - - ; if(FileExist("C:\Program Files\Google\Chrome\Application\chrome.exe")) - ; ChromeFilepath = C:\Program Files\Google\Chrome\Application\chrome.exe + MsgBox 0x10, Chrome Not Found, Chrome for Testing not found.`nIf this is your first time running on this computer, please click the "Chrome Up-To-Date" button to download the latest chrome binaries. } } ToolTip diff --git a/Shared-GoTos.ahk b/Shared-GoTos.ahk index 7a8a842..929e3e2 100644 --- a/Shared-GoTos.ahk +++ b/Shared-GoTos.ahk @@ -8,17 +8,17 @@ CheckForUpdates: ; GitReleasesAPIURL ; ChromeFilepath -Message = Checking for Updates -SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging") +; Message = Checking for Updates +; SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging") if(CheckForUpdates(GitReleasesAPIURL)){ - GuiControl,,UpdateAvailable, Update Available! + GuiControl,,UpdateAvailable, %ScriptAbbreviatedName% Update Available! } if(CheckForChromeUpdates(ChromeFilepath)){ GuiControl,,ChromeUpdateAvailable, Chrome Update Available! - ChromeUpdateAvailable := 1 + ; ChromeUpdateAvailable := 1 } ToolTip Return @@ -29,6 +29,14 @@ Return UpdateChrome: +; if chroem doesn't exist, download it +if(ChromeFilepath = ""){ + Status := DownloadLatestChromium() + if(Status) + GuiControl,,ChromeUpdateAvailable, Chrome Up-To-Date + Return +} + if(CheckForChromeUpdates = "") Status := CheckForChromeUpdates(ChromeFilepath) @@ -46,7 +54,7 @@ if(!status){ Status := DownloadLatestChromium() if(Status) - GuiControl,,ChromeUpdateAvailable, Chrome Up-to-Date + GuiControl,,ChromeUpdateAvailable, Chrome Up-To-Date Return /*