diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb index c4a6145..96909f1 100644 --- a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb +++ b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb @@ -27,7 +27,6 @@ Public Class ShiftOSMenu ' MsgBox("Why? Because of " & ex.Message) 'End Try CheckInstall() - CheckUpdate() BannerChange.Start() End Sub @@ -56,8 +55,8 @@ Public Class ShiftOSMenu Case "Continue" Strings.IsFree = False Strings.OnceInfo(6) = "story" - Terminal.Show() Terminal.StayAtChapter = True + Terminal.Show() Close() Case "No" Label3.Visible = False @@ -156,17 +155,25 @@ Public Class ShiftOSMenu Private Sub CheckInstall() If Directory.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\ShiftFS") = True Then - 'Dim WhatVersion As String = File.ReadAllText(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\version.txt") - 'If WhatVersion = My.Resources.CurrentVersion Then - - 'Else - ' btn_Aboot.Enabled = False - ' btn_Exit.Enabled = False - ' btn_FreeRoam.Enabled = False - ' btn_StoryMode.Enabled = False - ' ShouldUpdate = True - ' ShiftOSUpdater.Show() - 'End If + Dim CurrentVersion As String = My.Resources.CurrentVersion + If File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\version.txt") = True Then + TheUpdater.WhatVersion = File.ReadAllText(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\version.txt") + Else + TheUpdater.WhatVersion = "0.2.3" + End If + If TheUpdater.WhatVersion = My.Resources.CurrentVersion Then + File.WriteAllText(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\version.txt", My.Resources.CurrentVersion) + CheckUpdate() + Else + btn_Aboot.Enabled = False + btn_Exit.Enabled = False + btn_FreeRoam.Enabled = False + btn_StoryMode.Enabled = False + ShouldUpdate = True + ShiftOSUpdater.Show() + ShiftOSUpdater.Label2.Text = "A new version, " & CurrentVersion & " is available." & Environment.NewLine & "Update now to get more features." + ShiftOSUpdater.Button2.Text = "Update" + End If Else If Directory.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS") = True Then If Directory.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\ShiftFS") = True Then diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.vb b/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.vb index ba2ec12..089ea5f 100644 --- a/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.vb +++ b/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.vb @@ -40,15 +40,15 @@ Public Class ShiftOSUpdater Button2.Text = "Saved" End If ElseIf Button2.Text = "Update" Then - Label2.Text = "Updating ShiftOS from" & My.Resources.CurrentVersion & " to " & NewVersion - + Label2.Text = "Updating ShiftOS to " & My.Resources.CurrentVersion + UpdateToNew() Else - + Close() End If End Sub Private Sub ShiftOSUpdate_Load(sender As Object, e As EventArgs) Handles MyBase.Load If ShiftOSMenu.ShouldUpdate = True Then - Button1.Text = "Update" + Button2.Text = "Update" End If End Sub diff --git a/ShiftOS-TheRevival/MainForms/TheUpdater.vb b/ShiftOS-TheRevival/MainForms/TheUpdater.vb new file mode 100644 index 0000000..1ef506a --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/TheUpdater.vb @@ -0,0 +1,69 @@ +Imports System.IO + +Module TheUpdater + + Public WhatVersion As String + Public Sub UpdateToNew() + Dim AvailableFeatureHere As String() = File.ReadAllLines(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\AvailableFeature.sos") + Dim ComputerInfoHere As String() = File.ReadAllLines(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\ComputerInfo.sos") + Select Case WhatVersion + Case "0.2.3" + Strings.AvailableFeature(0) = AvailableFeatureHere(0) + Strings.AvailableFeature(1) = AvailableFeatureHere(1) + Strings.AvailableFeature(2) = AvailableFeatureHere(2) + Strings.AvailableFeature(3) = AvailableFeatureHere(3) + Strings.AvailableFeature(4) = AvailableFeatureHere(4) + Strings.AvailableFeature(5) = AvailableFeatureHere(5) + Strings.AvailableFeature(6) = AvailableFeatureHere(6) + Strings.AvailableFeature(7) = AvailableFeatureHere(7) + Strings.AvailableFeature(8) = AvailableFeatureHere(8) + Strings.AvailableFeature(9) = AvailableFeatureHere(9) + Strings.AvailableFeature(10) = AvailableFeatureHere(10) + Strings.AvailableFeature(11) = AvailableFeatureHere(11) + Strings.AvailableFeature(12) = AvailableFeatureHere(12) + Strings.AvailableFeature(13) = AvailableFeatureHere(13) + Strings.AvailableFeature(14) = AvailableFeatureHere(14) + Strings.AvailableFeature(15) = AvailableFeatureHere(15) + Strings.AvailableFeature(16) = "0" + Strings.AvailableFeature(17) = "0" + Strings.AvailableFeature(18) = "0" + Strings.AvailableFeature(19) = "0" + Strings.AvailableFeature(20) = "0" + Strings.AvailableFeature(21) = "0" + Strings.AvailableFeature(22) = "0" + If Strings.AvailableFeature(15) = 1 Then + Strings.AvailableFeature(16) = "0" + Else + Strings.AvailableFeature(16) = "2" + End If + Strings.AvailableFeature(17) = "2" + If Strings.AvailableFeature(2) = 1 Then + Strings.AvailableFeature(18) = "0" + Strings.AvailableFeature(21) = "0" + Else + Strings.AvailableFeature(18) = "2" + Strings.AvailableFeature(21) = "2" + End If + If Strings.AvailableFeature(0) = 1 Then + Strings.AvailableFeature(19) = "0" + Strings.AvailableFeature(20) = "0" + Else + Strings.AvailableFeature(19) = "2" + Strings.AvailableFeature(20) = "2" + End If + Strings.AvailableFeature(22) = "2" + Strings.ComputerInfo(0) = ComputerInfoHere(0) + Strings.ComputerInfo(1) = ComputerInfoHere(1) + Strings.ComputerInfo(2) = ComputerInfoHere(2) + Strings.ComputerInfo(3) = ComputerInfoHere(3) + Strings.ComputerInfo(4) = ComputerInfoHere(4) + Strings.ComputerInfo(5) = "0F" + Strings.ComputerInfo(6) = "F0" + ShiftOSUpdater.Button2.Text = "Updated!" + End Select + File.WriteAllText(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\version.txt", My.Resources.CurrentVersion) + File.WriteAllLines(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\AvailableFeature.sos", Strings.AvailableFeature) + File.WriteAllLines(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\ComputerInfo.sos", Strings.ComputerInfo) + ShiftOSMenu.ShouldUpdate = False + End Sub +End Module \ No newline at end of file diff --git a/ShiftOS-TheRevival/Resources/CurrentVersion.txt b/ShiftOS-TheRevival/Resources/CurrentVersion.txt index 373f8c6..72f9fa8 100644 --- a/ShiftOS-TheRevival/Resources/CurrentVersion.txt +++ b/ShiftOS-TheRevival/Resources/CurrentVersion.txt @@ -1 +1 @@ -0.2.3 \ No newline at end of file +0.2.4 \ No newline at end of file diff --git a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj index 8447290..61a4748 100644 --- a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj +++ b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj @@ -132,6 +132,7 @@ + True