Skip to content

Commit

Permalink
Merge pull request #353 from rcmaehl/0.8.0.0-dev
Browse files Browse the repository at this point in the history
Add Europe Mode + Others
  • Loading branch information
rcmaehl authored Dec 18, 2023
2 parents 1b21a31 + d01e215 commit de8de7f
Show file tree
Hide file tree
Showing 4 changed files with 247 additions and 80 deletions.
37 changes: 37 additions & 0 deletions Includes/_Countries.au3
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
Global $aCountries[37][3] = _
[["Austria", 14, "AT"], _
["Belgium", 21, "BE"], _
["Bulgaria", 35, "BG"], _
["Croatia", 108, "HR"], _
["Cyprus", 59, "CY"], _
["Czech Republic", 75, "CZ"], _
["Denmark", 61, "DK"], _
["Estonia", 70, "EE"], _
["Finland", 77, "FI"], _
["France", 84, "FR"], _
["French Guiana", 317, "GF"], _
["Germany", 94, "DE"], _
["Greece", 98, "GR"], _
["Hungary", 109, "HU"], _
["Ireland", 68, "IE"], _
["Iceland", 110, "IS"], _
["Italy", 118, "IT"], _
["Latvia", 140, "LV"], _
["Liechtenstein", 145, "LI"], _
["Lithuania", 141, "LT"], _
["Luxembourg", 147, "LU"], _
["Malta", 163, "MT"], _
["Martinique", 330, "MQ"], _
["Mayotte", 331, "YT"], _
["Netherlands", 176, "NL"], _
["Norway", 177, "NO"], _
["Poland", 191, "PL"], _
["Portugal", 193, "PT"], _
["Reunion", 198, "RE"], _
["Romania", 200, "RO"], _
["Singapore", 215, "GP"], _
["Slovakia", 143, "SK"], _
["Slovenia", 212, "SI"], _
["Spain", 217, "ES"], _
["Sweden", 221, "SE"], _
["Switzerland", 223, "CH"]]
2 changes: 1 addition & 1 deletion Includes/_Stocks.au3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Local $aStocks[10154][2] = _
Global $aStocks[10154][2] = _
[["A","a1mnrw"], _
["AA","a1mnur"], _
["AAA","bvqj77"], _
Expand Down
22 changes: 21 additions & 1 deletion MSEdgeRedirect.au3
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ Func ProcessCMDLine()
Local $aInstall[3]
Local $bPortable = False

$aInstall = _IsInstalled()
If DriveGetType(@ScriptDir) = "Removable" Then $bPortable = True

If $iParams > 0 Then
Expand Down Expand Up @@ -232,6 +233,26 @@ Func ProcessCMDLine()
Case "/change"
RunSetup(True, $bSilent, 1)
Exit
Case "/ContinueActive"
If Not $bIsAdmin Then
MsgBox($MB_ICONERROR+$MB_OK, _
"Admin Required", _
"Unable to install Active Mode without Admin Rights!")
FileWrite($hLogs[$AppFailures], _NowCalc() & " - " & "Active Mode UAC Elevation Attempt Failed!" & @CRLF)
Exit
Else
RunSetup($aInstall[0], False, 2)
EndIf
Case "/ContinueEurope", "/SetEurope"
If Not $bIsAdmin Then
MsgBox($MB_ICONERROR+$MB_OK, _
"Admin Required", _
"Unable to Setup Europe Mode without Admin Rights!")
FileWrite($hLogs[$AppFailures], _NowCalc() & " - " & "Europe Mode UAC Elevation Attempt Failed!" & @CRLF)
Exit
Else
RunSetup($aInstall[0], False, 5)
EndIf
Case "/f", "/force"
$bForce = True
_ArrayDelete($CmdLine, 1)
Expand Down Expand Up @@ -339,7 +360,6 @@ Func ProcessCMDLine()
EndIf

If Not $bPortable Then
$aInstall = _IsInstalled()

Select
Case Not $aInstall[0] ; Not Installed
Expand Down
Loading

0 comments on commit de8de7f

Please sign in to comment.