Skip to content

Commit a723c74

Browse files
author
yournamem
committed
lets rollll
1 parent 87e9492 commit a723c74

File tree

3 files changed

+36
-14
lines changed

3 files changed

+36
-14
lines changed

‎windows/Jorts-Installer.exe‎

456 KB
Binary file not shown.

‎windows/Jorts-Installer.nsi‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33

44
Name Jorts
55

6+
VIAddVersionKey /LANG=0 "ProductName" "Jorts"
7+
VIAddVersionKey /LANG=0 "FileVersion" "3.5.0"
8+
VIAddVersionKey /LANG=0 "ProductVersion" "3.5.0"
9+
VIAddVersionKey /LANG=0 "FileDescription" "https://github.com/ellie-commons/jorts"
10+
VIAddVersionKey /LANG=0 "LegalCopyright" "GNU GPL v3 Ellie-Commons"
11+
VIProductVersion "3.5.0.0"
12+
613
Outfile "Jorts-Installer.exe"
714
InstallDir "$LOCALAPPDATA\Programs\Jorts"
815

@@ -11,14 +18,18 @@ RequestExecutionLevel user
1118

1219
# Set the title of the installer window
1320
Caption "Jorts Installer"
21+
BrandingText "Jorts 3.5.0, Ellie-Commons 2025"
1422

1523
# Set the title and text on the welcome page
1624
!define MUI_WELCOMEPAGE_TITLE "Welcome to Jorts setup"
1725
!define MUI_WELCOMEPAGE_TEXT "This bitch will guide you through the installation of Jorts."
1826
!define MUI_INSTFILESPAGE_TEXT "Please wait while Jorts is being installed."
1927
!define MUI_ICON "icons\install.ico"
2028
!define MUI_UNICON "icons\uninstall.ico"
21-
!define MUI_FINISHPAGE_RUN "$SMPROGRAMS\Startup\Jorts.lnk"
29+
30+
!define MUI_FINISHPAGE_LINK "Source code and wiki"
31+
!define MUI_FINISHPAGE_LINK_LOCATION "https://github.com/ellie-commons/jorts"
32+
!define MUI_FINISHPAGE_RUN "$SMPROGRAMS\Jorts\Jorts.lnk"
2233

2334
!insertmacro MUI_PAGE_WELCOME
2435
!insertmacro MUI_PAGE_DIRECTORY
@@ -92,9 +103,10 @@ Section "Install"
92103

93104
; fonts. We install to local fonts to not trip up admin rights, and register for local user
94105
SetOutPath "$LOCALAPPDATA\Microsoft\Windows\Fonts"
95-
File "fonts\RedactedScript-Regular.ttf"
106+
File /r "fonts\*"
96107
WriteRegStr HKCU "Software\Microsoft\Windows NT\CurrentVersion\Fonts" "Redacted Script Regular (TrueType)" "$LOCALAPPDATA\Microsoft\Windows\Fonts\RedactedScript-Regular.ttf"
97-
; SendMessage 0 0 /TIMEOUT=5000
108+
WriteRegStr HKCU "Software\Microsoft\Windows NT\CurrentVersion\Fonts" "Inter (TrueType)" "$LOCALAPPDATA\Microsoft\Windows\Fonts\InterVariable.ttf"
109+
SetOutPath "$INSTDIR"
98110

99111
; Start menu
100112
CreateShortCut "$SMPROGRAMS\Jorts\Jorts.lnk" "$INSTDIR\bin\io.github.ellie_commons.jorts.exe" "" "$INSTDIR\icons\icon-mini.ico" 0
@@ -110,9 +122,12 @@ Section "Install"
110122

111123
; Add to Add/Remove programs list
112124
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "DisplayName" "Jorts"
113-
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "UninstallString" "$INSTDIR\Uninstall.exe"
125+
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "DisplayIcon" "$INSTDIR\icons\icon.ico"
114126
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "InstallLocation" "$INSTDIR\"
127+
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "UninstallString" "$INSTDIR\Uninstall.exe"
115128
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "Publisher" "Ellie-Commons"
129+
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "URLInfoAbout" "https://github.com/ellie-commons/jorts"
130+
WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "EstimatedSize" "0x00026548" ;157MB
116131
SectionEnd
117132

118133
Section "Uninstall"
@@ -132,6 +147,12 @@ Section "Uninstall"
132147
RMDir $SMPROGRAMS\Jorts
133148
RMDir "$INSTDIR"
134149

150+
; Remove font
151+
Delete "$LOCALAPPDATA\Microsoft\Windows\Fonts\RedactedScript-Regular.ttf"
152+
DeleteRegKey HKCU "Software\Microsoft\Windows NT\CurrentVersion\Fonts\Redacted Script Regular (TrueType)"
153+
Delete "$LOCALAPPDATA\Microsoft\Windows\Fonts\InterVariable.ttf"
154+
DeleteRegKey HKCU "Software\Microsoft\Windows NT\CurrentVersion\Fonts\Inter Variable (TrueType)"
155+
135156
; Remove registry keys
136157
DeleteRegKey HKCU "Software\Jorts"
137158
DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts"

‎windows/deploy.sh‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ mkdir -p "${deploy_dir}/etc"
2424
mkdir -p "${deploy_dir}/share"
2525
mkdir -p "${deploy_dir}/lib"
2626
mkdir -p "${deploy_dir}/include"
27+
mkdir -p "${deploy_dir}/usr"
28+
2729
cp "${build_dir}/src/${exe_name}" "${deploy_dir}/bin"
2830
cp -r "windows/icons" "${deploy_dir}"
2931

@@ -35,9 +37,9 @@ do
3537
done
3638

3739

38-
#cp -rnv /mingw64/bin/rsvg-convert.exe ${deploy_dir}/bin/
39-
#cp -rnv /mingw64/bin/librsvg-2-2.dll ${deploy_dir}/bin/
40-
#cp -rnv /mingw64/bin/libxml2-16.dll ${deploy_dir}/bin/
40+
cp -rnv /mingw64/bin/rsvg-convert.exe ${deploy_dir}/bin/
41+
cp -rnv /mingw64/bin/librsvg-2-2.dll ${deploy_dir}/bin/
42+
cp -rnv /mingw64/bin/libxml2-16.dll ${deploy_dir}/bin/
4143

4244

4345
# Copy other required things for Gtk to work nicely
@@ -80,7 +82,7 @@ cat << EOF > ${deploy_dir}/etc/gtk-4.0/settings.ini
8082
[Settings]
8183
gtk-theme-name=${theme_name}
8284
gtk-icon-theme-name=elementary
83-
gtk-font-name=Inter 9
85+
gtk-font-name=Inter Variable 9
8486
gtk-xft-antialias=1
8587
gtk-xft-hinting=1
8688
gtk-xft-hintstyle=hintful
@@ -103,7 +105,7 @@ VIAddVersionKey /LANG=0 "FileVersion" "${version}"
103105
VIAddVersionKey /LANG=0 "ProductVersion" "${version}"
104106
VIAddVersionKey /LANG=0 "FileDescription" "https://github.com/ellie-commons/jorts"
105107
VIAddVersionKey /LANG=0 "LegalCopyright" "GNU GPL v3 Ellie-Commons"
106-
VIProductVersion "${version}"
108+
VIProductVersion "${version}.0"
107109
108110
Outfile "${app_name}-Installer.exe"
109111
InstallDir "\$LOCALAPPDATA\\Programs\\${app_name}"
@@ -124,7 +126,7 @@ BrandingText "Jorts ${version}, Ellie-Commons 2025"
124126
125127
!define MUI_FINISHPAGE_LINK "Source code and wiki"
126128
!define MUI_FINISHPAGE_LINK_LOCATION "https://github.com/ellie-commons/jorts"
127-
!define MUI_FINISHPAGE_RUN "\$SMPROGRAMS\Startup\Jorts.lnk"
129+
!define MUI_FINISHPAGE_RUN "\$SMPROGRAMS\\${app_name}\\${app_name}.lnk"
128130
129131
!insertmacro MUI_PAGE_WELCOME
130132
!insertmacro MUI_PAGE_DIRECTORY
@@ -198,9 +200,8 @@ Section "Install"
198200
199201
; fonts. We install to local fonts to not trip up admin rights, and register for local user
200202
SetOutPath "\$LOCALAPPDATA\\Microsoft\\Windows\\Fonts"
201-
File "fonts\\RedactedScript-Regular.ttf"
203+
File /r "fonts\\*"
202204
WriteRegStr HKCU "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts" "Redacted Script Regular (TrueType)" "\$LOCALAPPDATA\\Microsoft\\Windows\\Fonts\\RedactedScript-Regular.ttf"
203-
File "fonts\\InterVariable.ttf"
204205
WriteRegStr HKCU "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts" "Inter (TrueType)" "\$LOCALAPPDATA\\Microsoft\\Windows\\Fonts\\InterVariable.ttf"
205206
SetOutPath "\$INSTDIR"
206207
@@ -245,9 +246,9 @@ Section "Uninstall"
245246
246247
; Remove font
247248
Delete "\$LOCALAPPDATA\\Microsoft\\Windows\\Fonts\\RedactedScript-Regular.ttf"
248-
DeleteRegKey HKCU "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts" "Redacted Script Regular (TrueType)"
249+
DeleteRegKey HKCU "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts\\Redacted Script Regular (TrueType)"
249250
Delete "\$LOCALAPPDATA\\Microsoft\\Windows\\Fonts\\InterVariable.ttf"
250-
DeleteRegKey HKCU "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts" "Inter (TrueType)"
251+
DeleteRegKey HKCU "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts\\Inter Variable (TrueType)"
251252
252253
; Remove registry keys
253254
DeleteRegKey HKCU "Software\\${app_name}"

0 commit comments

Comments
 (0)