RestartExecutableName actually does what it should now

#187 -- more breaking changes in functionality, sorry, but things work as intended now!

Author: Deadpikle

src/NetSparkle.Samples.NetCore.WPF/MainWindow.xaml.cs

@@ -40,7 +40,8 @@ public MainWindow()
             _sparkle = new SparkleUpdater("https://netsparkleupdater.github.io/NetSparkle/files/sample-app/appcast.xml", new DSAChecker(Enums.SecurityMode.Strict))
             {
                 UIFactory = new NetSparkleUpdater.UI.WPF.UIFactory(NetSparkleUpdater.UI.WPF.IconUtilities.ToImageSource(icon)),
-                ShowsUIOnMainThread = false
+                ShowsUIOnMainThread = false,
+                //RelaunchAfterUpdate = true,
                 //UseNotificationToast = true
             };
             // TLS 1.2 required by GitHub (https://developer.github.com/changes/2018-02-01-weak-crypto-removal-notice/)

src/NetSparkle.Samples.NetFramework.WPF/MainWindow.xaml.cs

@@ -29,7 +29,8 @@ public MainWindow()
             _sparkle = new SparkleUpdater("https://netsparkleupdater.github.io/NetSparkle/files/sample-app/appcast.xml", new DSAChecker(Enums.SecurityMode.Strict))
             {
                 UIFactory = new NetSparkleUpdater.UI.WPF.UIFactory(NetSparkleUpdater.UI.WPF.IconUtilities.ToImageSource(icon)),
-                ShowsUIOnMainThread = false
+                ShowsUIOnMainThread = false,
+                //RelaunchAfterUpdate = true,
                 //UseNotificationToast = true
             };
             // TLS 1.2 required by GitHub (https://developer.github.com/changes/2018-02-01-weak-crypto-removal-notice/)

src/NetSparkle/SparkleUpdater.cs

@@ -284,8 +284,8 @@ public string RestartExecutablePath
         /// This is the name that will be used/started when the update has been installed.
         /// This defaults to <see cref="Environment.CommandLine"/>.
         /// Used in conjunction with RestartExecutablePath to restart the application --
-        /// {RestartExecutablePath}/{RestartExecutableName} is what is called to restart the
-        /// app.
+        /// cd "{RestartExecutablePath}"
+        /// "{RestartExecutableName}" is what is called to restart the app.
         /// </summary>
         public string RestartExecutableName
         {
@@ -295,7 +295,20 @@ public string RestartExecutableName
                 {
                     return _restartExecutableName;
                 }
-                return Environment.CommandLine;
+#if NETCORE
+                try
+                {
+                    return Path.GetFileName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName);
+                } 
+                catch (Exception e)
+                {
+                    LogWriter?.PrintMessage("Unable to get executable name: " + e.Message);
+                }
+#endif
+                // we cannot just use Path.GetFileName because on .NET Framework it can fail with
+                // invalid chars in the path, so we do some crazy things to get the file name anotehr way
+                var cmdLine = Environment.CommandLine.Trim().TrimStart('"').TrimEnd('"');
+                return cmdLine.Substring(cmdLine.LastIndexOf(Path.DirectorySeparatorChar) + 1).Trim();
             }
             set
             {
@@ -415,7 +428,7 @@ public IAppCastHandler AppCastHandler
             set => _appCastHandler = value;
         }
 
-        #endregion
+#endregion
 
         /// <summary>
         /// Starts a SparkleUpdater background loop to check for updates every 24 hours.
@@ -569,7 +582,7 @@ private void UnregisterEvents()
             }
         }
 
-        #endregion
+#endregion
 
         /// <summary>
         /// This method checks if an update is required. During this process the appcast
@@ -1306,6 +1319,13 @@ protected virtual async Task RunDownloadedInstaller(string downloadFilePath)
             LogWriter.PrintMessage("Generating batch in {0}", Path.GetFullPath(batchFilePath));
 
             string processID = Process.GetCurrentProcess().Id.ToString();
+            string relaunchAfterUpdate = "";
+            if (RelaunchAfterUpdate)
+            {
+                relaunchAfterUpdate = $@"
+                    cd ""{workingDir}""
+                    ""{executableName}""";
+            }
 
             using (FileStream stream = new FileStream(batchFilePath, FileMode.Create, FileAccess.ReadWrite, FileShare.None, 4096, true))
             using (StreamWriter write = new StreamWriter(stream, new UTF8Encoding(false))/*new StreamWriter(batchFilePath, false, new UTF8Encoding(false))*/)
@@ -1315,13 +1335,6 @@ protected virtual async Task RunDownloadedInstaller(string downloadFilePath)
                     // We should wait until the host process has died before starting the installer.
                     // This way, any DLLs or other items can be replaced properly.
                     // Code from: http://stackoverflow.com/a/22559462/3938401
-                    string relaunchAfterUpdate = "";
-                    if (RelaunchAfterUpdate)
-                    {
-                        relaunchAfterUpdate = $@"
-                        cd ""{workingDir}""
-                        ""{executableName}""";
-                    }
 
                     string output = $@"
                         @echo off
@@ -1360,11 +1373,6 @@ setlocal ENABLEDELAYEDEXPANSION
                             fi;
                         done;
                     ";
-                    string relaunchAfterUpdate = "";
-                    if (RelaunchAfterUpdate)
-                    {
-                        relaunchAfterUpdate = Path.Combine(workingDir, executableName);
-                    }
                     if (IsZipDownload(downloadFilePath)) // .zip on macOS or .tar.gz on Linux
                     {
                         // waiting for finish based on http://blog.joncairns.com/2013/03/wait-for-a-unix-process-to-finish/

src/NetSparkle/Utilities.cs

@@ -130,6 +130,11 @@ public static string GetFullBaseDirectory()
             return fullBaseDirectory;
 #else
             // https://stackoverflow.com/a/837501/3938401
+            try
+            {
+                return Path.GetDirectoryName(new Uri(System.Reflection.Assembly.GetExecutingAssembly().CodeBase).LocalPath);
+            } 
+            catch {}
             return System.Reflection.Assembly.GetExecutingAssembly().CodeBase;
 #endif
         }