Skip to content

Commit 764b8e0

Browse files
confused-Techieconfused-Techie
committed
Updated Installer files, and versioning in server settings
1 parent 36e8141 commit 764b8e0

File tree

6 files changed

+51
-24
lines changed

6 files changed

+51
-24
lines changed

‎.dockerignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ reporting/
2424
*.exe
2525
# ignore original list.json
2626
list.json
27+
# ignore the binaries built for windows
28+
binaries/

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ list.json
77
DEV-docs
88
# Ignore any build left by go build .
99
*.exe
10+
# Ignore binaries built for windows
11+
binaries

‎GoPage.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ func main() {
369369
// now to allow static file serving for css and js assets
370370
fs := http.FileServer(http.Dir(viper.GetString("directories.staticAssets")))
371371
http.Handle("/assets/", http.StripPrefix("/assets/", fs))
372-
372+
373373
// allow static file serving from the plugins folder
374374
plugin := http.FileServer(http.Dir(viper.GetString("directories.plugin")))
375375
http.Handle("/plugins/", http.StripPrefix("/plugins/", plugin))

‎installer/GoPage.iss‎

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
77
AppId={{4322BAAB-9BD4-47F4-8F3C-471B1951D1F8}
88
AppName=GoPage
9-
AppVersion=0.1
10-
;AppVerName=GoPage 0.1
9+
AppVersion=0.3
1110
AppPublisher=LHBasics
1211
AppPublisherURL=https://www.lhbasics.com/
13-
AppSupportURL=https://www.lhbasics.com/
14-
AppUpdatesURL=https://www.lhbasics.com/
12+
AppSupportURL=https://github.com/confused-Techie/GoPage
13+
AppUpdatesURL=https://github.com/confused-Techie/GoPage
1514
DefaultDirName={localappdata}\.gopage
1615
DisableDirPage=yes
1716
DisableProgramGroupPage=yes
@@ -30,35 +29,56 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
3029
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
3130

3231
[Files]
33-
Source: "C:\Users\antho\go\bin\GoPage.exe"; DestDir: "{app}"; Flags: ignoreversion
32+
Source: "D:\Personal Documents\Github Repositories\GoPage\binaries\GoPage-v0.3.exe"; DestDir: "{app}"; DestName: "GoPage.exe"; Flags: ignoreversion
3433
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
35-
Source: "D:\Personal Documents\Github Repositories\GoPage\templates\editPage.html"; DestDir: "{app}\templates"; Flags: ignoreversion
36-
Source: "D:\Personal Documents\Github Repositories\GoPage\templates\error.html"; DestDir: "{app}\templates"; Flags: ignoreversion
37-
Source: "D:\Personal Documents\Github Repositories\GoPage\templates\homePage.html"; DestDir: "{app}\templates"; Flags: ignoreversion
38-
Source: "D:\Personal Documents\Github Repositories\GoPage\templates\newItem.html"; DestDir: "{app}\templates"; Flags: ignoreversion
34+
; Below we will instead specify directories instead of individual files
35+
Source: "D:\Personal Documents\Github Repositories\GoPage\templates\*"; DestDir: "{app}\templates"; Flags: ignoreversion
36+
Source: "D:\Personal Documents\Github Repositories\GoPage\plugins\*"; DestDir: "{app}\plugins"; Flags: ignoreversion
37+
Source: "D:\Personal Documents\Github Repositories\GoPage\cleanFiles\*"; DestDir: "{app}\cleanFiles"; Flags: ignoreversion
38+
Source: "D:\Personal Documents\Github Repositories\GoPage\settings\*"; DestDir: "{app}\settings"; Flags: ignoreversion
39+
Source: "D:\Personal Documents\Github Repositories\GoPage\assets\css\*"; DestDir: "{app}\assets\css"; Flags: ignoreversion
40+
Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\*"; DestDir: "{app}\assets\images"; Flags: ignoreversion
41+
Source: "D:\Personal Documents\Github Repositories\GoPage\assets\js\*"; DestDir: "{app}\assets\js"; Flags: ignoreversion
42+
Source: "D:\Personal Documents\Github Repositories\GoPage\assets\lang\*"; DestDir: "{app}\assets\lang"; Flags: ignoreversion
43+
; The different asset dirs are specified seperately to ensure moving userImages as a directory leaves it empty
44+
; Then the next to lines transfer configuration data to the app dir
45+
Source: "D:\Personal Documents\Github Repositories\GoPage\cleanFiles\config.yml"; DestDir: "{app}"; Flags: ignoreversion
46+
Source: "D:\Personal Documents\Github Repositories\GoPage\cleanFiles\list.json"; DestDir: "{app}"; Flags: ignoreversion
47+
; Finally we transfer the windows init script properly to edit the configuration file
48+
Source: "D:\Personal Documents\Github Repositories\GoPage\scripts\windowsInit.ps1"; DestDir: "{app}"; Flags: ignoreversion
49+
50+
;Source: "D:\Personal Documents\Github Repositories\GoPage\templates\editPage.html"; DestDir: "{app}\templates"; Flags: ignoreversion
51+
;Source: "D:\Personal Documents\Github Repositories\GoPage\templates\error.html"; DestDir: "{app}\templates"; Flags: ignoreversion
52+
;Source: "D:\Personal Documents\Github Repositories\GoPage\templates\homePage.html"; DestDir: "{app}\templates"; Flags: ignoreversion
53+
;Source: "D:\Personal Documents\Github Repositories\GoPage\templates\newItem.html"; DestDir: "{app}\templates"; Flags: ignoreversion
3954
; The above is for all template items
40-
Source: "D:\Personal Documents\Github Repositories\GoPage\assets\css\form.css"; DestDir: "{app}\assets\css"; Flags: ignoreversion
41-
Source: "D:\Personal Documents\Github Repositories\GoPage\assets\css\home.css"; DestDir: "{app}\assets\css"; Flags: ignoreversion
55+
;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\css\form.css"; DestDir: "{app}\assets\css"; Flags: ignoreversion
56+
;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\css\home.css"; DestDir: "{app}\assets\css"; Flags: ignoreversion
4257
; The above is for CSS items
43-
Source: "D:\Personal Documents\Github Repositories\GoPage\assets\js\form.js"; DestDir: "{app}\assets\js"; Flags: ignoreversion
44-
Source: "D:\Personal Documents\Github Repositories\GoPage\assets\js\home.js"; DestDir: "{app}\assets\js"; Flags: ignoreversion
58+
;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\js\form.js"; DestDir: "{app}\assets\js"; Flags: ignoreversion
59+
;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\js\home.js"; DestDir: "{app}\assets\js"; Flags: ignoreversion
4560
; The above is for JS items
46-
Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\edit.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
47-
Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\git-branch-white.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
48-
Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\github.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
49-
Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\github-white.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
50-
Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\trash-2.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
61+
;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\edit.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
62+
;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\git-branch-white.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
63+
;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\github.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
64+
;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\github-white.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
65+
;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\trash-2.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
5166
; The above is for image items
52-
Source: "D:\Personal Documents\Github Repositories\GoPage\cleanFiles\config.yml"; DestDir: "{app}"; Flags: ignoreversion
53-
Source: "D:\Personal Documents\Github Repositories\GoPage\cleanFiles\list.json"; DestDir: "{app}"; Flags: ignoreversion
67+
;Source: "D:\Personal Documents\Github Repositories\GoPage\cleanFiles\config.yml"; DestDir: "{app}"; Flags: ignoreversion
68+
;Source: "D:\Personal Documents\Github Repositories\GoPage\cleanFiles\list.json"; DestDir: "{app}"; Flags: ignoreversion
5469
; The above is for config file && data file
55-
Source: "D:\Personal Documents\Github Repositories\GoPage\scripts\windowsInit.ps1"; DestDir: "{app}"; Flags: ignoreversion
70+
;Source: "D:\Personal Documents\Github Repositories\GoPage\scripts\windowsInit.ps1"; DestDir: "{app}"; Flags: ignoreversion
71+
72+
73+
[Dirs]
74+
; To create the empty userImages Dir
75+
Name: "{app}\assets\userImages"
5676

5777
[Icons]
5878
Name: "{autoprograms}\GoPage"; Filename: "{app}\GoPage.exe"
5979
Name: "{autodesktop}\GoPage"; Filename: "{app}\GoPage.exe"; Tasks: desktopicon
6080

6181
[Run]
6282
Filename: "powershell.exe"; Parameters: "-ExecutionPolicy Bypass -File ""{app}\windowsInit.ps1"""; StatusMsg: "Config Setup"; WorkingDir: {app}; Flags: runhidden;
63-
;Filename: "{app}\windowsInit.ps1"; Parameters: "-ExecutionPolicy Bypass"; Description: "Config Setup"; StatusMsg: "Config Setup"; WorkingDir: {app}; Flags: runhidden
83+
6484
Filename: "{app}\GoPage.exe"; Description: "{cm:LaunchProgram,GoPage}"; Flags: nowait postinstall skipifsilent

‎scripts/windowsInit.ps1‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ $curDir = pwd;
33
Add-Content .\config.yml "`n staticAssets: '$pwd\assets\'";
44
Add-Content .\config.yml " templates: '$pwd\templates\'";
55
Add-Content .\config.yml " data: '$pwd\list.json'";
6+
Add-Content .\config.yml " plugin: '$pwd\plugins\'";
7+
Add-Content .\config.yml " setting: '$pwd\settings\'";
8+
Add-Content .\config.yml " script: '$pwd\scripts\'";

‎settings/serverSettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "GoPage",
3-
"version": "0.2",
3+
"version": "0.3",
44
"author": "confused-Techie",
55
"lang": "en"
66
}

0 commit comments

Comments
 (0)