Skip to content

Commit 2c13b22

Browse files
valnoxyvalnoxy
committed
Updated silent update
1 parent d40a66a commit 2c13b22

File tree

2 files changed

+32
-10
lines changed

2 files changed

+32
-10
lines changed

‎GoAwayEdge/App.xaml.cs

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ public void Application_Startup(object sender, StartupEventArgs e)
4747
case 1 when args.Contains("--debug"):
4848
{
4949
if (args.Contains("--debug"))
50-
IsDebug = true;
50+
IsDebug = true;
5151
if (IsAdministrator() == false)
5252
{
5353
ElevateAsAdmin();
54-
Environment.Exit(0);
54+
Environment.Exit(740);
5555
return;
5656
}
5757

@@ -71,15 +71,15 @@ public void Application_Startup(object sender, StartupEventArgs e)
7171
if (IsAdministrator() == false)
7272
{
7373
ElevateAsAdmin(string.Join(" ", args));
74-
Environment.Exit(0);
74+
Environment.Exit(740);
7575
return;
7676
}
7777

7878
// Check if user allowed opening the control panel
7979
if (RegistryConfig.GetKey("ControlPanelIsInstalled") != "True")
8080
{
8181
Logging.Log("Control Panel is not allowed on this system, exiting ...", Logging.LogLevel.ERROR);
82-
Environment.Exit(0);
82+
Environment.Exit(1);
8383
return;
8484
}
8585

@@ -111,6 +111,8 @@ public void Application_Startup(object sender, StartupEventArgs e)
111111

112112
if (args.Contains("-s")) // Silent Installation
113113
{
114+
Configuration.InitialEnvironment();
115+
114116
foreach (var arg in args)
115117
{
116118
if (arg.StartsWith("-e:"))
@@ -146,22 +148,21 @@ public void Application_Startup(object sender, StartupEventArgs e)
146148

147149
if (IsAdministrator() == false)
148150
{
149-
ElevateAsAdmin(string.Join(" ", args));
150-
Environment.Exit(0);
151+
var elevatedProcess = ElevateAndWait(string.Join(" ", args));
152+
Environment.Exit(elevatedProcess);
151153
return;
152154
}
153155

154156
Configuration.InstallControlPanel = true;
155-
Configuration.InitialEnvironment();
156157
var result = InstallRoutine.Install(null);
157158
Environment.Exit(result);
158159
}
159160
if (args.Contains("-u"))
160161
{
161162
if (IsAdministrator() == false)
162163
{
163-
ElevateAsAdmin(string.Join(" ", args));
164-
Environment.Exit(0);
164+
var elevatedProcess = ElevateAndWait(string.Join(" ", args));
165+
Environment.Exit(elevatedProcess);
165166
return;
166167
}
167168
var result = InstallRoutine.Uninstall(null);
@@ -236,7 +237,10 @@ public void Application_Startup(object sender, StartupEventArgs e)
236237
ifeoMessageUi.ShowDialog();
237238

238239
if (ifeoMessageUi.Summary == "Btn1")
240+
{
239241
ElevateAsAdmin("--update");
242+
Environment.Exit(740);
243+
}
240244

241245
Environment.Exit(0);
242246
}
@@ -269,6 +273,24 @@ private static void ElevateAsAdmin(string? arguments = null)
269273
Process.Start(startInfo);
270274
}
271275

276+
private static int ElevateAndWait(string? arguments = null)
277+
{
278+
// Restart program and run as admin
279+
var exeName = Process.GetCurrentProcess().MainModule?.FileName;
280+
if (exeName == null) return -1;
281+
var startInfo = new ProcessStartInfo(exeName)
282+
{
283+
Verb = "runas",
284+
UseShellExecute = true,
285+
Arguments = arguments
286+
};
287+
var p = new Process();
288+
p.StartInfo = startInfo;
289+
p.Start();
290+
p.WaitForExit();
291+
return p.ExitCode;
292+
}
293+
272294
private static string? ParseCustomUrl(string argument, int count)
273295
{
274296
var argParsed = argument.Remove(0, count);

‎GoAwayEdge/Properties/PublishProfiles/FolderProfile.pubxml.user

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
44
-->
55
<Project>
66
<PropertyGroup>
7-
<History>True|2024-12-26T14:22:32.4690057Z||;True|2024-12-26T15:09:04.1027404+01:00||;True|2024-12-26T15:03:19.0005711+01:00||;True|2024-12-25T17:22:09.8471194+01:00||;True|2024-08-13T19:39:30.3814052+02:00||;True|2024-08-13T19:35:07.3638159+02:00||;True|2024-08-13T01:10:27.4137217+02:00||;True|2024-08-13T01:06:17.9215774+02:00||;True|2024-08-13T00:56:54.4657665+02:00||;True|2024-08-13T00:49:21.1156303+02:00||;True|2024-08-13T00:45:56.3970427+02:00||;True|2024-08-13T00:25:23.5481220+02:00||;True|2024-08-12T22:11:19.4188626+02:00||;True|2024-08-12T22:10:38.2923046+02:00||;True|2024-08-12T22:08:45.6517147+02:00||;True|2024-07-30T00:22:22.2984409+02:00||;True|2024-07-30T00:18:17.4366719+02:00||;True|2024-07-30T00:17:49.8084336+02:00||;True|2024-07-22T18:41:59.8117684+02:00||;True|2024-06-18T00:28:22.3138517+02:00||;True|2024-06-18T00:16:46.9788815+02:00||;True|2024-06-09T20:14:23.6305404+02:00||;True|2024-06-09T19:02:49.2570274+02:00||;True|2024-06-09T18:47:29.9573023+02:00||;True|2024-06-09T18:46:39.8011527+02:00||;False|2024-06-09T18:46:05.6633541+02:00||;False|2024-06-09T18:45:59.2563619+02:00||;True|2024-02-18T17:16:27.0408261+01:00||;True|2024-02-18T17:15:41.3961034+01:00||;True|2024-02-18T17:11:58.7761728+01:00||;True|2024-02-18T17:08:57.9390623+01:00||;True|2024-02-18T17:08:26.6377454+01:00||;True|2024-02-18T17:07:45.2050537+01:00||;True|2024-02-18T17:05:12.7495146+01:00||;True|2024-02-18T17:02:32.4549017+01:00||;True|2024-02-18T16:48:25.3074382+01:00||;True|2023-10-19T00:00:28.0962969+02:00||;True|2022-11-13T02:33:03.7406004+01:00||;True|2022-11-13T02:19:07.9073988+01:00||;True|2022-11-13T02:18:35.3043045+01:00||;True|2022-11-12T20:05:07.6366825+01:00||;False|2022-11-12T20:04:52.3576134+01:00||;True|2022-11-12T19:36:12.8480978+01:00||;</History>
7+
<History>True|2024-12-26T17:33:52.9873568Z||;True|2024-12-26T18:31:07.1677995+01:00||;True|2024-12-26T17:03:19.1985996+01:00||;True|2024-12-26T16:24:41.8789667+01:00||;True|2024-12-26T15:22:32.4690057+01:00||;True|2024-12-26T15:09:04.1027404+01:00||;True|2024-12-26T15:03:19.0005711+01:00||;True|2024-12-25T17:22:09.8471194+01:00||;True|2024-08-13T19:39:30.3814052+02:00||;True|2024-08-13T19:35:07.3638159+02:00||;True|2024-08-13T01:10:27.4137217+02:00||;True|2024-08-13T01:06:17.9215774+02:00||;True|2024-08-13T00:56:54.4657665+02:00||;True|2024-08-13T00:49:21.1156303+02:00||;True|2024-08-13T00:45:56.3970427+02:00||;True|2024-08-13T00:25:23.5481220+02:00||;True|2024-08-12T22:11:19.4188626+02:00||;True|2024-08-12T22:10:38.2923046+02:00||;True|2024-08-12T22:08:45.6517147+02:00||;True|2024-07-30T00:22:22.2984409+02:00||;True|2024-07-30T00:18:17.4366719+02:00||;True|2024-07-30T00:17:49.8084336+02:00||;True|2024-07-22T18:41:59.8117684+02:00||;True|2024-06-18T00:28:22.3138517+02:00||;True|2024-06-18T00:16:46.9788815+02:00||;True|2024-06-09T20:14:23.6305404+02:00||;True|2024-06-09T19:02:49.2570274+02:00||;True|2024-06-09T18:47:29.9573023+02:00||;True|2024-06-09T18:46:39.8011527+02:00||;False|2024-06-09T18:46:05.6633541+02:00||;False|2024-06-09T18:45:59.2563619+02:00||;True|2024-02-18T17:16:27.0408261+01:00||;True|2024-02-18T17:15:41.3961034+01:00||;True|2024-02-18T17:11:58.7761728+01:00||;True|2024-02-18T17:08:57.9390623+01:00||;True|2024-02-18T17:08:26.6377454+01:00||;True|2024-02-18T17:07:45.2050537+01:00||;True|2024-02-18T17:05:12.7495146+01:00||;True|2024-02-18T17:02:32.4549017+01:00||;True|2024-02-18T16:48:25.3074382+01:00||;True|2023-10-19T00:00:28.0962969+02:00||;True|2022-11-13T02:33:03.7406004+01:00||;True|2022-11-13T02:19:07.9073988+01:00||;True|2022-11-13T02:18:35.3043045+01:00||;True|2022-11-12T20:05:07.6366825+01:00||;False|2022-11-12T20:04:52.3576134+01:00||;True|2022-11-12T19:36:12.8480978+01:00||;</History>
88
<LastFailureDetails />
99
</PropertyGroup>
1010
</Project>

0 commit comments

Comments
 (0)