Skip to content
This repository was archived by the owner on Feb 1, 2025. It is now read-only.

Commit 0426b03

Browse files
authored
Merge pull request #36 from SibTiger/PSCAT-Version-1.1.0
- Project Name will no longer be displayed when running 'Clean Mode'. - Revised the 'Uninstall' operations to 'Deep Clean'. - Removed the PSCAT Program Mode scripts, the launcher and the Batch scripts provide this functionality in a seamless way already. - Beta worthy!
2 parents a8ec9b6 + f6ea06d commit 0426b03

File tree

10 files changed

+21
-934
lines changed

10 files changed

+21
-934
lines changed

Installer/Scripts/Installation Files/Files.iss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@ Source: "Scripts\Launcher\Launcher.ps1"; \
3434
DestDir: "{app}\Bin\"; \
3535
Flags: confirmoverwrite touch;
3636

37-
Source: "Scripts\Program Modes\Clean.ps1"; \
38-
DestDir: "{app}\Bin\"; \
39-
Flags: confirmoverwrite touch;
40-
41-
Source: "Scripts\Program Modes\Uninstall.ps1"; \
42-
DestDir: "{app}\Bin\"; \
43-
Flags: confirmoverwrite touch;
44-
4537
Source: "Installer\Product Assets\Bootstrap\Bootstrap Loader.bat"; \
4638
DestDir: "{app}\Bootstrap\"; \
4739
Flags: confirmoverwrite touch;

Installer/Scripts/Project Information.iss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#define public _PRODUCT_NAME_FULL_ "PowerShell Compact-Archive Tool"
3232
#define public _PRODUCT_NAME_SHORT_ "PSCAT"
3333
#define public _PRODUCT_VERSION_ "1.1.0"
34-
#define public _PRODUCT_VERSION_CODENAME_ "Cordis"
35-
#define public _PRODUCT_VERSION_DATE_ "2022.05.22"
34+
#define public _PRODUCT_VERSION_CODENAME_ "Cordis [Beta Version]"
35+
#define public _PRODUCT_VERSION_DATE_ "23.05.2022"
3636
#define public _PRODUCT_WEBSITE_HOMEPAGE_ "https://github.com/SibTiger/PowerShell-Compact-Archive-Tool"
3737
#define public _PRODUCT_WEBSITE_SUPPORT_ "https://github.com/SibTiger/PowerShell-Compact-Archive-Tool/wiki"
3838
#define public _PRODUCT_WEBSITE_UPDATES_ "https://github.com/SibTiger/PowerShell-Compact-Archive-Tool/releases"

Scripts/Clean.ps1

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# - Compiled Builds
3232
# - Log files
3333
# - Report files
34-
# - Uninstall
34+
# - Deep Cleanup
3535
# - Compiled Builds
3636
# - Log files
3737
# - Report files
@@ -93,7 +93,7 @@ function clean()
9393

9494

9595
# Provide a new Window Title
96-
[CommonIO]::SetTerminalWindowTitle("$($Global:_PROGRAMNAME_) (Version $($Global:_VERSION_)) for $([ProjectInformation]::projectName) - $([ProjectInformation]::codeName)");
96+
[CommonIO]::SetTerminalWindowTitle("$($Global:_PROGRAMNAME_) (Version $($Global:_VERSION_)) - Clean Mode");
9797

9898

9999
# Load the user's configurations, if available.
@@ -119,14 +119,14 @@ function clean()
119119
} # Clean Up Mode
120120

121121

122-
# Uninstall Mode
123-
{($_ -eq [CleanUpModeType]::Uninstall)}
122+
# Deep Clean Up Mode
123+
{($_ -eq [CleanUpModeType]::DeepCleanUp)}
124124
{
125-
# Let the user know that the application is uninstalling itself.
126-
[CommonIO]::WriteToBuffer("Uninstalling`r`n`r`n", + `
125+
# Let the user know that the application is performing a deep cleanup.
126+
[CommonIO]::WriteToBuffer("Deep Clean Up`r`n`r`n", + `
127127
[LogMessageLevel]::Warning, + `
128128
$false);
129-
} # Uninstall Mode
129+
} # Deep Clean Up Mode
130130
} # switch : Program Mode
131131

132132

@@ -195,7 +195,7 @@ function clean()
195195

196196

197197
# Delete the user configuration file
198-
if ($programMode -eq [CleanUpModeType]::Uninstall)
198+
if ($programMode -eq [CleanUpModeType]::DeepCleanUp)
199199
{
200200
[CommonIO]::WriteToBuffer("`tUser Configuration`r`n`t`t$GLOBAL:_PROGRAMDATA_ROOT_ROAMING_PATH_", + `
201201
[LogMessageLevel]::Warning, + `
@@ -215,7 +215,7 @@ function clean()
215215
[LogMessageLevel]::Error, + `
216216
$false);
217217
} # if : Failed to Delete Directory - Logs\Reports
218-
} # if : Uninstall
218+
} # if : Deep Clean Up
219219

220220

221221

@@ -246,32 +246,6 @@ function clean()
246246

247247

248248

249-
# Program Files
250-
# -----------
251-
# -----------
252-
253-
254-
# Let the user know that they will need to expunge the program files manually, but if and only if the Uninstall flag is raised.
255-
if ($programMode -eq [CleanUpModeType]::Uninstall)
256-
{
257-
[CommonIO]::WriteToBuffer("`tProgram Files", + `
258-
[LogMessageLevel]::Warning, + `
259-
$false);
260-
261-
262-
# Because it is going to take large amounts of time to make this functionality work, it is best to have the user to delete the directory themselves.
263-
# NOTE: This approach is mainly for Power Users; others will benefit from the Installer packages.
264-
[CommonIO]::WriteToBuffer("`t`tIn order to delete the $($GLOBAL:_PROGRAMNAME_) Program Files, you will have to delete following directory:", + `
265-
[LogMessageLevel]::Attention, + `
266-
$false);
267-
268-
269-
[CommonIO]::WriteToBuffer("`t`t$GLOBAL:_SCRIPTPATH_", + `
270-
[LogMessageLevel]::Warning, + `
271-
$false);
272-
} # if : Uninstall
273-
274-
275249

276250
# ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
277251
# ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
@@ -329,5 +303,5 @@ enum CleanUpModeType
329303
{
330304
Nothing = 0; # No cleaning is required
331305
CleanUp = 1; # Standard Cleanup Operation
332-
Uninstall = 2; # Uninstall the Application
306+
DeepCleanUp = 2; # Deep Cleanup Operation
333307
} # CleanUpModeType

Scripts/Initializations.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function InitializationProgramIdentity()
7373
-Description "The short name of the application";
7474

7575
# Version
76-
Set-Variable -Name "_VERSION_" -Value "1.1.0 - Alpha" `
76+
Set-Variable -Name "_VERSION_" -Value "1.1.0 - Beta" `
7777
-Option ReadOnly -Scope Global -ErrorAction SilentlyContinue `
7878
-Visibility Public `
7979
-Description "The version of the application";
@@ -87,7 +87,7 @@ function InitializationProgramIdentity()
8787

8888
# Release Date
8989
# Date Format: DD.MM.YYYY with leading zeros
90-
Set-Variable -Name "_RELEASEDATE_" -Value "xx.03.2022" `
90+
Set-Variable -Name "_RELEASEDATE_" -Value "23.10.2022" `
9191
-Option ReadOnly -Scope Global -ErrorAction SilentlyContinue `
9292
-Visibility Public `
9393
-Description "The date in which the version of the application was released.";

Scripts/Launcher/Launcher.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
Program Mode [integer value]
5353
0 = Normal mode; compile projects (Default)
5454
1 = Clean up mode; remove some generated data
55-
2 = Uninstall mode; removes all generated data
55+
2 = Deep clean up mode; removes all generated data
5656
5757
.OUTPUTS
5858
Operation Return Code
@@ -111,7 +111,7 @@ param(
111111
# Software runs normally, no changes.
112112
# 1 = Clean Up Mode
113113
# Deletes all builds, logs, and report files.
114-
# 2 = Uninstall Mode
114+
# 2 = Deep Clean Up Mode
115115
# Deletes all builds, logs, report files, and user configuration.
116116
[Parameter(Mandatory=$false)]
117117
[ValidateRange(0, 2)]

0 commit comments

Comments
 (0)