Skip to content

Commit ab015f0

Browse files
committed
Updated FSCW script to 2.04
1 parent bd6ba4e commit ab015f0

File tree

3 files changed

+35
-27
lines changed

3 files changed

+35
-27
lines changed

README.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Font Setup Creator for Windows (FSCW) is a a toolkit to create a Windows desktop setup for fonts.
44

5-
It is driven by a [DATA.ini](https://github.com/source-foundry/fscw/blob/master/src/Data.ini) file that includes all necessary information about the font(s) to install and uses [Inno Setup](http://www.jrsoftware.org/isinfo.php) to generate the Setup.exe file. If you do not run Windows, a build script for [AppVeyor](https://www.appveyor.com/) is also included. AppVeyor can build the Setup EXE automatically each time you push to your repository.
5+
It is driven by a [DATA.ini](https://github.com/source-foundry/FSCW/blob/master/src/Data.ini) file that includes all necessary information about the font(s) to install and uses [Inno Setup](http://www.jrsoftware.org/isinfo.php) to generate the Setup.exe file. If you do not run Windows, a build script for [AppVeyor](https://www.appveyor.com/) is also included. AppVeyor can build the Setup EXE automatically each time you push to your repository.
66

77
## Why this project exists
88

@@ -15,11 +15,11 @@ Although it might seem like overkill to use a Windows installer for fonts, there
1515
- Uses downloads `(SetupExe)` from your repository and double clicks it.
1616
- User sees a *Windows protected your PC* message, clicks on `More info` and selects `Run anyway`.
1717
- **Note:** This *Windows SmartScreen warning* can be safely ignored as it is caused only by the fact that the EXE is not digitally signed. You may want to upload the EXE file to [VirusTotal](http://www.virustotal.com) and link to the report from your repository.
18-
- User is asked if the font(s) should be installed ([Screenshot](https://github.com/source-foundry/fscw/raw/master/img/screenshot-install.png)).
19-
- `(SetupExe)` asks the user to perform a restart ([Screenshot](https://github.com/source-foundry/fscw/raw/master/img/screenshot-restart.png)).
18+
- User is asked if the font(s) should be installed ([Screenshot](https://github.com/source-foundry/FSCW/raw/master/img/screenshot-install.png)).
19+
- `(SetupExe)` asks the user to perform a restart ([Screenshot](https://github.com/source-foundry/FSCW/raw/master/img/screenshot-restart.png)).
2020
- Font can be used.
2121

22-
To uninstall, the user goes to the *Add/Remove Programs* applet in Control Panel, selects the entry and clicks on *Remove* ([Screenshot](https://github.com/source-foundry/fscw/raw/master/img/screenshot-uninstall.png)).
22+
To uninstall, the user goes to the *Add/Remove Programs* applet in Control Panel, selects the entry and clicks on *Uninstall* ([Screenshot](https://github.com/source-foundry/FSCW/raw/master/img/screenshot-uninstall.png)).
2323

2424
## How to use it
2525

@@ -34,7 +34,7 @@ To uninstall, the user goes to the *Add/Remove Programs* applet in Control Panel
3434

3535
- Perform the steps described in [How to use it](#how-to-use-it)
3636
- Download [Inno Setup](http://www.jrsoftware.org/isinfo.php)
37-
- Please make sure the option "Inno Setup Prepocessor" is activated during install
37+
- Please make sure the option "Inno Setup Prepocessor" is activated during install
3838
- Open `src\FSCW.iss`
3939
- Select *Build* - *Compile* (CTRL+F9)
4040
- Retrieve your `(SetupExe)` from the `\out` folder
@@ -49,15 +49,17 @@ To uninstall, the user goes to the *Add/Remove Programs* applet in Control Panel
4949
- Click *NEW PROJECT*
5050
- Select your repository and click *Add*
5151
- Push to your repository and AppVeyor will create the setup EXE for you automatically (might take some minutes)
52-
- You can download the EXE file by selecting your project, clicking on *LATEST BUILD* and selecting *ARTIFACTS*
52+
- You can download the `(SetupExe)` file by selecting your project, clicking on *LATEST BUILD* and selecting *ARTIFACTS*
53+
54+
You can also change [appveyor.yml](https://github.com/source-foundry/FSCW/blob/master/appveyor.yml) so the resulting `(SetupExe)` is added as a new release to you repository. The command for this is only commented out, but requires a GitHub token. Please use *Encrypt data* within AppVeyor.com (Right side of the top row) to encrypt your token!
5355

5456
## Contributions
5557

56-
Any constructive contribution is very welcome, regarless if it's an [issue](https://github.com/source-foundry/Hack-windows-installer/issues/new) or a [pull request](https://help.github.com/articles/using-pull-requests/).
58+
Any constructive contribution is very welcome, regarless if it's an [issue](https://github.com/source-foundry/FSCW/issues/new) or a [pull request](https://help.github.com/articles/using-pull-requests/).
5759

58-
If users of the setup are experience difficulties, please open a new [issue](https://github.com/source-foundry/Hack-windows-installer/issues/new) and include the log file FSCW generates. This log file can be found in C:\Program Files\\`(DestinationFolder)`\\*Log-FSCW.txt*. Please post the entire contents of this log along with the issue.
60+
If users of the setup are experience difficulties, please open a new [issue](https://github.com/source-foundry/FSCW/issues/new) and include the log file FSCW generates. This log file can be found in C:\Program Files\\`(DestinationFolder)`\\*Log-FSCW.txt*. Please post the entire contents of this log along with the issue.
5961

6062

6163
## License
62-
Copyright © 2016 [Michael 'Tex' Hex](http://www.texhex.info/) / Source Foundry. Licensed under the **MIT License**. For details, please see [LICENSE.txt](https://github.com/source-foundry/Hack-test-win-installer/blob/master/LICENSE.txt).
64+
Copyright © 2016 [Michael 'Tex' Hex](http://www.texhex.info/) / [Source Foundry](http://sourcefoundry.org/hack/). Licensed under the **MIT License**. For details, please see [LICENSE.txt](https://github.com/source-foundry/FSCW/blob/master/LICENSE.txt).
6365

src/FSCW.iss

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
//Copyright (C) 2016 Michael 'Tex' Hex / Source Foundry
33
//Licensed under the MIT License
44
//https://github.com/source-foundry/fscw
5+
//--------------------------------------------------------
6+
//Version of this installer script. Please do not change.
7+
#define public ScriptVersion '2.04'
8+
//--------------------------------------------------------
9+
510

611
//We require InnoSetup 5.5.9
712
#if VER < EncodeVer(5,5,9)
@@ -253,11 +258,6 @@
253258

254259

255260

256-
//--------------------------------------------------------
257-
//Version of this installer script. Please do not change.
258-
#define public ScriptVersion '2.04'
259-
//--------------------------------------------------------
260-
261261

262262

263263
;---DEBUG---
@@ -438,6 +438,9 @@ Name: "{app}\Website"; Filename: "{#Website}";
438438
#undef i
439439
;------------------------
440440

441+
;Delete old log files that were use prior to FSCW
442+
Type: files; Name: "{app}\Log-FontData*.txt"
443+
441444

442445
[Registry]
443446
;------------------------

src/zz_FSCW_Preprocessed.iss

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99

1010

11+
1112
; ISPP Base Path: C:\dev\git\fscw\
1213

1314

@@ -104,7 +105,6 @@
104105

105106

106107

107-
108108
;---DEBUG---
109109
;This output ensures that we do not have font_xxx array elements that are empty.
110110
;Because the sub expects a string for each item, an error from ISPP about "Actual datatype not declared type"
@@ -133,7 +133,7 @@
133133
AppId=TenGallonHatSetup
134134
SetupMutex=TenGallonHatSetup_Mutex
135135

136-
AppName=TenGallonHat Font
136+
AppName=Ten Gallon Hat Font
137137

138138
AppVersion=1.0.0
139139
VersionInfoVersion=1.0.0
@@ -204,10 +204,10 @@ AllowCancelDuringInstall=False
204204
;Patching default Windows/App text
205205
[Messages]
206206
;SetupAppTitle is displayed in the taskbar
207-
SetupAppTitle=TenGallonHat Font
207+
SetupAppTitle=Ten Gallon Hat Font
208208

209209
;SetupWindowsTitle is displayed in the setup window itself so we better include the version
210-
SetupWindowTitle=TenGallonHat Font 1.0.0
210+
SetupWindowTitle=Ten Gallon Hat Font 1.0.0
211211

212212
;Messages for the "Read to install" wizard page
213213
;NOT USED - "Ready To Install" - below title bar
@@ -265,6 +265,9 @@ Name: "{app}\Website"; Filename: "http://sourcefoundry.org/hack/";
265265
Type: files; Name: "{fonts}\Hack-RegularOblique-DEV.otf";
266266
;------------------------
267267

268+
;Delete old log files that were use prior to FSCW
269+
Type: files; Name: "{app}\Log-FontData*.txt"
270+
268271

269272
[Registry]
270273
;------------------------
@@ -287,7 +290,7 @@ Name: "{app}\Website"; Filename: "http://sourcefoundry.org/hack/";
287290
[INI]
288291
;Create an ini to make detection for enterprise deployment tools easy
289292
Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Version"; String: "1.0.0"
290-
Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Name"; String: "TenGallonHat Font"
293+
Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Name"; String: "Ten Gallon Hat Font"
291294

292295

293296
[UninstallDelete]
@@ -556,7 +559,7 @@ begin
556559
title:=SetupMessage(msgWizardPreparing);
557560
subTitle:=SetupMessage(msgPreparingDesc);
558561
559-
StringChangeEx(subTitle, '[name]', 'TenGallonHat Font', True);
562+
StringChangeEx(subTitle, '[name]', 'Ten Gallon Hat Font', True);
560563
customProgressPage:=CreateOutputProgressPage(title, subTitle);
561564
end;
562565
@@ -669,7 +672,7 @@ begin
669672
670673
LogAsImportant('--------------------------------');
671674
LogAsImportant('Font name.....: Ten Gallon Hat fonts');
672-
LogAsImportant('Script version: 2.03');
675+
LogAsImportant('Script version: 2.04');
673676
LogAsImportant('Setup version.: 1.0.0');
674677
LogAsImportant('Font version..: 1.02');
675678
LogAsImportant('Local time....: ' + GetDateTimeString('yyyy-dd-mm hh:nn', '-', ':'));
@@ -766,17 +769,17 @@ begin
766769
appDestinationFolder:=AddBackslash(appDestinationFolder);
767770
if DirExists(appDestinationFolder) then begin
768771
769-
If FileExists(appDestinationFolder + 'Log-FontData.txt') then begin
772+
If FileExists(appDestinationFolder + 'Log-FSCW.txt') then begin
770773
771-
If FileExists(appDestinationFolder + 'Log-FontData-old.txt') then begin
772-
DeleteFile(appDestinationFolder + 'Log-FontData-old.txt');
774+
If FileExists(appDestinationFolder + 'Log-FSCW-old.txt') then begin
775+
DeleteFile(appDestinationFolder + 'Log-FSCW-old.txt');
773776
end;
774777
775-
RenameFile(appDestinationFolder + 'Log-FontData.txt', appDestinationFolder + 'Log-FontData-old.txt');
778+
RenameFile(appDestinationFolder + 'Log-FSCW.txt', appDestinationFolder + 'Log-FSCW-old.txt');
776779
end;
777780
778-
log('Saving font state to ' + appDestinationFolder + 'Log-FontData.txt');
779-
SaveStringsToFile(appDestinationFolder + 'Log-FontData.txt', FontStateBuffer, false); //do not append
781+
log('Saving font state to ' + appDestinationFolder + 'Log-FSCW.txt');
782+
SaveStringsToFile(appDestinationFolder + 'Log-FSCW.txt', FontStateBuffer, false); //do not append
780783
end;
781784
782785

0 commit comments

Comments
 (0)