[READ-ONLY] Mirror of https://github.com/jackmawer/BlueRoseClassic.
Bug fixes
Update installer no longer overrides shortcuts and creates a new
uninstaller.
Zack Casey
(Feb 2, 2016, 12:55 AM EST)
6370bf74
94133211
+28
-45
+11
-2
BlueRose/BlueRose.cs
+11
-2
BlueRose/BlueRose.cs
···
125
125
return sLine;
126
126
}
127
127
128
+
/// <summary>
129
+
///
130
+
/// </summary>
131
+
/// <param name="file"></param>
132
+
/// <returns></returns>
128
133
public static string readBuild(string file)
129
134
{
130
135
string line;
131
136
132
137
try
133
138
{
134
-
string buildFile = Environment.CurrentDirectory + file;
139
+
string buildFile = Environment.CurrentDirectory + @"/" + file;
135
140
SysIO.StreamReader fileRead = new SysIO.StreamReader(buildFile);
136
141
while ((line = fileRead.ReadLine()) != null)
137
142
{
···
148
153
return "";
149
154
}
150
155
156
+
/// <summary>
157
+
///
158
+
/// </summary>
159
+
/// <param name="file"></param>
151
160
public static void writeBuild(string file)
152
161
{
153
-
string buildFile = Environment.CurrentDirectory + file;
162
+
string buildFile = Environment.CurrentDirectory + @"/" + file;
154
163
string localDist = distNum();
155
164
156
165
try
+8
-8
BlueRose/BlueRoseGUI.Designer.cs
+8
-8
BlueRose/BlueRoseGUI.Designer.cs
···
41
41
//
42
42
// playBtn
43
43
//
44
-
this.playBtn.Location = new System.Drawing.Point(12, 92);
44
+
this.playBtn.Location = new System.Drawing.Point(8, 89);
45
45
this.playBtn.Name = "playBtn";
46
46
this.playBtn.Size = new System.Drawing.Size(50, 23);
47
47
this.playBtn.TabIndex = 0;
···
51
51
//
52
52
// devBtn
53
53
//
54
-
this.devBtn.Location = new System.Drawing.Point(68, 92);
54
+
this.devBtn.Location = new System.Drawing.Point(64, 89);
55
55
this.devBtn.Name = "devBtn";
56
56
this.devBtn.Size = new System.Drawing.Size(60, 23);
57
57
this.devBtn.TabIndex = 1;
···
61
61
//
62
62
// btnUpdate
63
63
//
64
-
this.btnUpdate.Location = new System.Drawing.Point(12, 121);
64
+
this.btnUpdate.Location = new System.Drawing.Point(8, 118);
65
65
this.btnUpdate.Name = "btnUpdate";
66
66
this.btnUpdate.Size = new System.Drawing.Size(116, 23);
67
67
this.btnUpdate.TabIndex = 5;
···
73
73
//
74
74
this.fsoLogo.BackColor = System.Drawing.Color.Transparent;
75
75
this.fsoLogo.Image = ((System.Drawing.Image)(resources.GetObject("fsoLogo.Image")));
76
-
this.fsoLogo.Location = new System.Drawing.Point(12, 12);
76
+
this.fsoLogo.Location = new System.Drawing.Point(8, 9);
77
77
this.fsoLogo.Name = "fsoLogo";
78
78
this.fsoLogo.Size = new System.Drawing.Size(116, 57);
79
79
this.fsoLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
···
82
82
//
83
83
// btnUpdateLauncher
84
84
//
85
-
this.btnUpdateLauncher.Location = new System.Drawing.Point(12, 150);
85
+
this.btnUpdateLauncher.Location = new System.Drawing.Point(8, 147);
86
86
this.btnUpdateLauncher.Name = "btnUpdateLauncher";
87
87
this.btnUpdateLauncher.Size = new System.Drawing.Size(116, 23);
88
88
this.btnUpdateLauncher.TabIndex = 10;
···
93
93
// localBuild
94
94
//
95
95
this.localBuild.AutoSize = true;
96
-
this.localBuild.Location = new System.Drawing.Point(89, 76);
96
+
this.localBuild.Location = new System.Drawing.Point(85, 73);
97
97
this.localBuild.Name = "localBuild";
98
98
this.localBuild.Size = new System.Drawing.Size(35, 13);
99
99
this.localBuild.TabIndex = 11;
···
103
103
// versionIS
104
104
//
105
105
this.versionIS.AutoSize = true;
106
-
this.versionIS.Location = new System.Drawing.Point(9, 76);
106
+
this.versionIS.Location = new System.Drawing.Point(5, 73);
107
107
this.versionIS.Name = "versionIS";
108
108
this.versionIS.Size = new System.Drawing.Size(74, 13);
109
109
this.versionIS.TabIndex = 12;
···
116
116
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
117
117
this.BackColor = System.Drawing.Color.White;
118
118
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
119
-
this.ClientSize = new System.Drawing.Size(142, 182);
119
+
this.ClientSize = new System.Drawing.Size(132, 182);
120
120
this.Controls.Add(this.versionIS);
121
121
this.Controls.Add(this.localBuild);
122
122
this.Controls.Add(this.btnUpdateLauncher);
+9
-3
BlueRose/BlueRoseGUI.cs
+9
-3
BlueRose/BlueRoseGUI.cs
···
29
29
private string errorBtn = "ERROR";
30
30
WebClient client = new WebClient();
31
31
string blueRoseFile = "bluerose.zip";
32
-
string updateBuild = "Latest build #" + BlueRose.distNum();
32
+
string updateBuild = "Download build #" + BlueRose.distNum();
33
+
string build = "fsobuild";
33
34
34
35
public BlueRoseGUI()
35
36
{
···
38
39
InitializeComponent();
39
40
this.MaximizeBox = false;
40
41
this.MinimizeBox = false;
41
-
localBuild.Text = BlueRose.readBuild("fsobuild");
42
+
localBuild.Text = BlueRose.readBuild(build);
42
43
43
44
} catch (Exception ex)
44
45
{
···
80
81
81
82
client.DownloadFileAsync(TeamCity.tcAddress("servo.freeso.org", "ProjectDollhouse_TsoClient"), "teamcity.zip");
82
83
84
+
localBuild.Text = "...";
85
+
83
86
btnUpdate.Text = "Downloading";
84
87
btnUpdate.Enabled = false;
85
88
devBtn.Enabled = false;
···
106
109
107
110
BlueRose.wildUnZip();
108
111
109
-
BlueRose.writeBuild("fsobuild");
112
+
BlueRose.writeBuild(build);
113
+
110
114
111
115
btnUpdate.Text = updateBuild;
112
116
btnUpdate.Enabled = true;
113
117
devBtn.Enabled = true;
114
118
playBtn.Enabled = true;
119
+
120
+
localBuild.Text = BlueRose.readBuild(build);
115
121
116
122
}
117
123
-32
Installer - update.nsi
-32
Installer - update.nsi
···
21
21
File "BlueRose\bin\Release\Ionic.Zip.dll"
22
22
File "BlueRose\bin\Release\Ionic.Zip.xml"
23
23
24
-
# create the uninstaller
25
-
WriteUninstaller "$INSTDIR\Uninstall Blue Rose.exe"
26
-
27
-
# create start menu shortcut
28
-
CreateDirectory "$SMPROGRAMS\FreeSO\"
29
-
CreateShortCut "$SMPROGRAMS\FreeSO\FreeSO.lnk" "$INSTDIR\BlueRoseLauncher.exe"
30
-
CreateShortCut "$SMPROGRAMS\FreeSO\Uninstall Blue Rose.lnk" "$INSTDIR\Uninstall Blue Rose.exe"
31
-
32
-
# create desktop shortcut
33
-
CreateShortCut "$DESKTOP\FreeSO.lnk" "$INSTDIR\BlueRoseLauncher.exe"
34
-
35
-
SectionEnd
36
-
37
-
38
-
Section "Uninstall"
39
-
40
-
# first, delete installed files
41
-
Delete "$INSTDIR\BlueRoseLauncher.exe"
42
-
Delete "$INSTDIR\BlueRoseLauncher.exe.config"
43
-
Delete "$INSTDIR\BlueRoseLauncher.pdb"
44
-
Delete "$INSTDIR\BlueRose.Distro.dll"
45
-
Delete "$INSTDIR\BlueRose.Distro.pdb"
46
-
Delete "$INSTDIR\Ionic.Zip.dll"
47
-
Delete "$INSTDIR\Ionic.Zip.xml"
48
-
Delete "$INSTDIR\Uninstall BlueRoseLauncher.exe"
49
-
50
-
# second, the shortcuts
51
-
Delete "$DESKTOP\FreeSO.lnk"
52
-
Delete "$SMPROGRAMS\FreeSO\FreeSO.lnk"
53
-
Delete "$SMPROGRAMS\FreeSO\Uninstall Blue Rose.lnk"
54
-
Delete "$SMPROGRAMS\FreeSO\"
55
-
56
24
SectionEnd