From b54de3eb36a6b0ee58fc1e0be3f984c91ccf0dc0 Mon Sep 17 00:00:00 2001
From: fyr77 <login@notjakob.com>
Date: Sat, 8 May 2021 00:04:40 +0200
Subject: [PATCH] remove broken updater for now

---
 EnvyUpdate/GlobalVars.cs              |  2 +-
 EnvyUpdate/MainWindow.xaml            |  2 --
 EnvyUpdate/MainWindow.xaml.cs         | 36 ++++++++++++++++++++--
 EnvyUpdate/Properties/AssemblyInfo.cs |  4 +--
 README.md                             | 44 ++++++++++++---------------
 5 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/EnvyUpdate/GlobalVars.cs b/EnvyUpdate/GlobalVars.cs
index ab234c7..c5ab17d 100644
--- a/EnvyUpdate/GlobalVars.cs
+++ b/EnvyUpdate/GlobalVars.cs
@@ -9,7 +9,7 @@ namespace EnvyUpdate
         public static readonly string exeloc = System.Reflection.Assembly.GetEntryAssembly().Location;
         public static readonly string exepath = Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location) + "\\";
         public static readonly string startmenu = Environment.GetFolderPath(Environment.SpecialFolder.StartMenu);
-        public static readonly float version = 2.7F;
+        public static readonly float version = 2.8F;
         public static readonly string appdata = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\envyupdate\\";
         public static readonly string startup = Environment.GetFolderPath(Environment.SpecialFolder.Startup);
         public static readonly string desktopOverride = exepath + "desktop.envy";
diff --git a/EnvyUpdate/MainWindow.xaml b/EnvyUpdate/MainWindow.xaml
index 77c6c30..f5e1ec4 100644
--- a/EnvyUpdate/MainWindow.xaml
+++ b/EnvyUpdate/MainWindow.xaml
@@ -19,9 +19,7 @@
         <Button x:Name="buttonHelp" Content="..." Margin="0,12,10,0" Click="buttonHelp_Click" HorizontalAlignment="Right" Width="20" Height="20" VerticalAlignment="Top" Grid.RowSpan="2"/>
         <TextBlock Margin="10,40,0,0" TextWrapping="Wrap" FontWeight="Bold" Grid.Row="1" HorizontalAlignment="Left" Width="151" Height="16" VerticalAlignment="Top"><Run Text="{x:Static p:Resources.ui_onlinedriver}"/></TextBlock>
         <TextBlock x:Name="textblockOnline" HorizontalAlignment="Right" Margin="0,40,10,0" TextWrapping="Wrap" Text="&lt;none&gt;" Width="106" Grid.Row="1" Height="16" VerticalAlignment="Top" TextAlignment="Right"/>
-        <CheckBox x:Name="chkInstall" Content="{x:Static p:Resources.ui_install}" HorizontalAlignment="Left" Margin="10,83,0,0" IsChecked="False" Unchecked="chkInstall_Unchecked" Checked="chkInstall_Checked" Width="51" Grid.Row="1" Height="16" VerticalAlignment="Top"/>
         <Button x:Name="buttonDL" Content="⟱" Margin="0,0,10,10" FontSize="20" Click="buttonDL_Click" Foreground="White" Background="#FF3CDA00" Visibility="Hidden" Grid.Row="1" HorizontalAlignment="Right" Width="30" Height="30" VerticalAlignment="Bottom"/>
-        <CheckBox x:Name="chkAutostart" Content="{x:Static p:Resources.ui_autostart}" HorizontalAlignment="Left" Margin="10,62,0,0" IsEnabled="False" Checked="chkAutostart_Checked" Unchecked="chkAutostart_Unchecked" Width="69" Grid.Row="1" Height="16" VerticalAlignment="Top"/>
         <TextBlock x:Name="textblockGPUName" Margin="10,14,35,0" TextWrapping="Wrap" Text="GPU..." Height="16" VerticalAlignment="Top" TextAlignment="Center" Grid.RowSpan="2" FontWeight="Bold"/>
     </Grid>
 </Window>
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index a05d3db..3b1c2b9 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -42,12 +42,15 @@ namespace EnvyUpdate
                 Environment.Exit(1);
             }
             // Set correct ticks
+            /*
             if (File.Exists(GlobalVars.startup + "\\EnvyUpdate.lnk"))
                 chkAutostart.IsChecked = true;
             if (File.Exists(GlobalVars.appdata + "EnvyUpdate.exe"))
-                chkInstall.IsChecked = true;
+                chkInstall.IsChecked = true;*/
+            //ALSO BROKEN
 
             // Check if application is installed and update
+            /*
             if (GlobalVars.exepath == GlobalVars.appdata)
             {
                 try
@@ -63,7 +66,11 @@ namespace EnvyUpdate
                 }
                 // Also set correct ticks.
                 chkInstall.IsChecked = true;
-            }
+            }*/
+            //BROKEN
+
+            // Delete installed versions
+            UninstallAll();
 
             // Check for overrides
             if (File.Exists(GlobalVars.desktopOverride))
@@ -189,7 +196,7 @@ namespace EnvyUpdate
             }
         }
 
-        private void chkInstall_Checked(object sender, RoutedEventArgs e)
+        /*private void chkInstall_Checked(object sender, RoutedEventArgs e)
         {
             if (chkAutostart != null)
             {
@@ -247,6 +254,29 @@ namespace EnvyUpdate
         {
             File.Delete(GlobalVars.startup + "\\EnvyUpdate.lnk");
         }
+        */
+
+        public void UninstallAll()
+        {
+            if (File.Exists(GlobalVars.startup + "\\EnvyUpdate.lnk"))
+            {
+                File.Delete(GlobalVars.startup + "\\EnvyUpdate.lnk");
+            }
+
+            if (File.Exists(GlobalVars.startmenu + "\\EnvyUpdate.lnk"))
+            {
+                File.Delete(GlobalVars.startmenu + "\\EnvyUpdate.lnk");
+            }
+            if ((GlobalVars.exepath == GlobalVars.appdata) && File.Exists(GlobalVars.appdata + "EnvyUpdate.exe"))
+            {
+                MessageBox.Show("EnvyUpdate must be uninstalled because of an application bug. Please download the most recent version again.");
+                Util.SelfDelete();
+            }
+            else if (Directory.Exists(GlobalVars.appdata))
+            {
+                Directory.Delete(GlobalVars.appdata, true);
+            }
+        }
 
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
diff --git a/EnvyUpdate/Properties/AssemblyInfo.cs b/EnvyUpdate/Properties/AssemblyInfo.cs
index f912aaf..a86b276 100644
--- a/EnvyUpdate/Properties/AssemblyInfo.cs
+++ b/EnvyUpdate/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.7")]
-[assembly: AssemblyFileVersion("2.7")]
+[assembly: AssemblyVersion("2.8")]
+[assembly: AssemblyFileVersion("2.8")]
diff --git a/README.md b/README.md
index 0c4e180..d1f1f46 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+Currently (as of 2.8), EnvyUpdate is portable only, because of a broken installer and updater. This will be changed in a future update to be released soon!
+
 ![Logo](https://github.com/fyr77/envyupdate/blob/master/res/banner.png?raw=true)
 
 # EnvyUpdate
@@ -9,31 +11,8 @@
  
 ## How to use
 
-### 2.0 and later
-
  1. Download the [latest release](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.exe) (or as a [.zip](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.zip)) and run it. Windows SmartScreen Messages can be safely ignored. They only happen because this project is not digitally signed.
- 2. If you want to install the application, tick "Install". Otherwise it will run in portable mode.
- 
-### 1.x
-
- 1. Download the [latest release](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.exe) (or as a [.zip](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.zip)) and run it. Windows SmartScreen Messages can be safely ignored. They only happen because this project is not digitally signed.
- 2. If you want to use the application without saving any settings to your drive, keep the "Portable mode" checkbox checked. Otherwise uncheck it to automatically save your configuration.
- 3. Install the cookie-txt addon for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/cookies-txt-one-click/) or [Chrome](https://chrome.google.com/webstore/detail/cookiestxt/njabckikapfpffapmjgojcnbfjonfjfg).
- 4. Go to the [Nvidia driver download page](https://www.nvidia.com/Download/index.aspx), enter your graphics card model, operating system, etc. and click "Search".
- 5. On the resulting page, click back in your browser and use the previously installed cookie-txt addon to save your site cookies as a .txt file.
- 6. Drag this .txt file into the corresponding space inside EnvyUpdate.
- 7. If everything works correctly, the online driver version should be displayed in the application window. 
- 8. When not in portable mode, you may activate Autostart. This will make the application start everytime Windows boots. This will also install the application itself in your APPDATA folder.
- 
-## Uninstalling
-
-### 2.0 and later
-
-Untick "Install". This will delete EnvyUpdate from your system.
-
-### 1.x
-
-Simply download the latest release from the [releases page](https://github.com/fyr77/EnvyUpdate/releases), run it and untick "Autostart". This will remove EnvyUpdate from your system.
+ 2. Currently (as of 2.8), EnvyUpdate is portable only, because of a broken installer and updater. This will be changed in a future update to be released soon!
 
 ## Compatibility
 
@@ -65,3 +44,20 @@ EnvyUpdate is not a replacement for any of these tools. I will still try to impl
 * Newtonsoft.Json: [MIT](https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md)
 * Resource Embedder: [MIT](https://github.com/MarcStan/resource-embedder/blob/master/LICENSE)
 * Icon made by Freepik from www.flaticon.com
+
+## OLD 1.x Instructions for Archival purposes
+
+### Installing 
+
+ 1. Download the [latest release](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.exe) (or as a [.zip](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.zip)) and run it. Windows SmartScreen Messages can be safely ignored. They only happen because this project is not digitally signed.
+ 2. If you want to use the application without saving any settings to your drive, keep the "Portable mode" checkbox checked. Otherwise uncheck it to automatically save your configuration.
+ 3. Install the cookie-txt addon for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/cookies-txt-one-click/) or [Chrome](https://chrome.google.com/webstore/detail/cookiestxt/njabckikapfpffapmjgojcnbfjonfjfg).
+ 4. Go to the [Nvidia driver download page](https://www.nvidia.com/Download/index.aspx), enter your graphics card model, operating system, etc. and click "Search".
+ 5. On the resulting page, click back in your browser and use the previously installed cookie-txt addon to save your site cookies as a .txt file.
+ 6. Drag this .txt file into the corresponding space inside EnvyUpdate.
+ 7. If everything works correctly, the online driver version should be displayed in the application window. 
+ 8. When not in portable mode, you may activate Autostart. This will make the application start everytime Windows boots. This will also install the application itself in your APPDATA folder.
+ 
+### Uninstalling
+
+Simply download the latest release from the [releases page](https://github.com/fyr77/EnvyUpdate/releases), run it and untick "Autostart". This will remove EnvyUpdate from your system.
\ No newline at end of file