Skip to content

Commit c85aff3

Browse files
committed
miniscule typos
revert help addition add LICENSE and readme to release
1 parent 28d96b9 commit c85aff3

5 files changed

Lines changed: 16 additions & 19 deletions

File tree

.github/workflows/release.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
VERSION="${GITHUB_REF#refs/tags/v}"
2323
echo "Setting version to $VERSION in csproj"
2424
sed -i 's|<Version>.*</Version>|<Version>'"$VERSION"'</Version>|' TyranoScriptMemoryUnlocker.csproj
25+
echo "VERSION=$VERSION" >> $GITHUB_ENV
2526
2627
# - name: Restore dependencies
2728
# run: dotnet restore tsmu/TyranoScriptMemoryUnlocker.csproj
@@ -57,17 +58,18 @@ jobs:
5758
--output ./publish/linux-x64
5859
5960
# Find the output executable names
60-
- name: Get Windows executable
61+
- name: Zip Windows
6162
id: winexe
6263
run: |
63-
echo "file=./publish/win-x64/tsmu.exe" >> $GITHUB_OUTPUT
64+
zip -j ./publish/win-x64/tsmu-win-x64-${{ env.VERSION }}.zip ./publish/win-x64/tsmu.exe ./LICENSE ./README.md
65+
echo "file=./publish/win-x64/tsmu-win-x64-${{ env.VERSION }}.zip" >> $GITHUB_OUTPUT
6466
65-
- name: Tar and gzip Linux executable
67+
- name: Tar and gzip Linux
6668
id: linuxexe
6769
run: |
68-
tar -cvf - ./publish/linux-x64/tsmu | gzip -9 > ./publish/linux-x64/tsmu.tar.gz
69-
echo "file=./publish/linux-x64/tsmu.tar.gz" >> $GITHUB_OUTPUT
70-
70+
tar -cvf - ./publish/linux-x64/tsmu ./LICENSE ./README.md | gzip -9 > ./publish/linux-x64/tsmu-linux-x64-${{ env.VERSION }}.tar.gz
71+
echo "file=./publish/linux-x64/tsmu-linux-x64-${{ env.VERSION }}.tar.gz" >> $GITHUB_OUTPUT
72+
7173
- name: Release
7274
uses: softprops/action-gh-release@v2
7375
if: github.ref_type == 'tag'

Program.cs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ public class TSMUArgs
3737
[Option("dry", HelpText = nameof(LocalizedString.HelpTextDryRun), ResourceType = typeof(LocalizedString))]
3838
public bool? DryRun { get; set; }
3939

40-
[Option('h', HelpText = nameof(LocalizedString.HelpTextHelp), ResourceType = typeof(LocalizedString))]
41-
public string? _help { get; set; }
42-
4340
public TSMUArgs()
4441
{
4542
// This is used to preserve the help texts for the command line arguments.
@@ -110,11 +107,6 @@ public static void Main(string[] args)
110107
}, args);
111108
parsed.WithParsed(args =>
112109
{
113-
if (args._help != null)
114-
{
115-
HelpArgExit(title, desc, build, copr, lic, dsclmr, parsed);
116-
return;
117-
}
118110
if (!Path.Exists(args.SavPath = Path.GetFullPath(args.SavPath ?? string.Empty)))
119111
{
120112
ExitArgsError(string.Format(LocalizedString.ErrorSavNotFound, args.SavPath),
@@ -346,7 +338,7 @@ private static void HelpArgExit(string? title, string desc, string? build, strin
346338
h.AddEnumValuesToHelpText = true;
347339
h.AutoVersion = false;
348340

349-
h.Heading = $"{title} {build}. {copr}.";
341+
h.Heading = $"{title} {build} {copr}.";
350342
h.Copyright = $"{lic} {dsclmr} {Environment.NewLine}";
351343
h.AddPreOptionsText(string.Format(LocalizedString.HelpTextDesc,
352344
desc, Environment.NewLine, LocalizedString.HelpTextOptPath));
@@ -362,8 +354,8 @@ private static void ExitArgsError(string? err, string? cmd, string? title, strin
362354
{
363355
var errText = new HelpText
364356
{
365-
Heading = $"{title} {build}. {copr}.",
366-
Copyright = $"{lic}. {dsclmr}." + Environment.NewLine,
357+
Heading = $"{title} {build} {copr}.",
358+
Copyright = $"{lic} {dsclmr}" + Environment.NewLine,
367359
};
368360
errText.AddPreOptionsLine(err);
369361
errText.AddPreOptionsLine(string.Empty);

Res/LocalizedString.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Res/LocalizedString.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<value>Not affiliated with TyranoScript.</value>
122122
</data>
123123
<data name="AppLic" xml:space="preserve">
124-
<value>Licensed under AGPLv3-and-later</value>
124+
<value>Licensed under AGPLv3-and-later.</value>
125125
</data>
126126
<data name="AppSuccess_Line1" xml:space="preserve">
127127
<value>The save file has been updated successfully.</value>

TyranoScriptMemoryUnlocker.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ See <https://www.gnu.org/licenses/>.
3333
- v0.3.1: Help text localization.
3434
Localization fixes and improvements.
3535
- v0.3.2: Fix command line argument parsing issues.
36+
- v0.3.3: Revert help option addition.
37+
Added license and readme to release files.
38+
Miniscule typos fixed.
3639
</Changelog>
3740
</PropertyGroup>
3841

0 commit comments

Comments
 (0)