[geany/geany-plugins] a8608a: Merge pull request #768 from eht16/issue761_windows_ship_letsencrypt_certificate

Frank Lanitz git-noreply at xxxxx
Sat Dec 1 07:47:46 UTC 2018


Branch:      refs/heads/master
Author:      Frank Lanitz <frank at frank.uvena.de>
Committer:   GitHub <noreply at github.com>
Date:        Sat, 01 Dec 2018 07:47:46 UTC
Commit:      a8608afe38b8bccd5bcc906c4b72fba4d0a13c82
             https://github.com/geany/geany-plugins/commit/a8608afe38b8bccd5bcc906c4b72fba4d0a13c82

Log Message:
-----------
Merge pull request #768 from eht16/issue761_windows_ship_letsencrypt_certificate

Windows installer: Install ca-certificates for UpdateChecker plugin


Modified Paths:
--------------
    build/geany-plugins.nsi
    build/gtk-bundle-from-msys2.sh

Modified: build/geany-plugins.nsi
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -327,6 +327,7 @@ Section Uninstall
 	RMDir /r "$INSTDIR\share\webkitgtk-1.0"
 	RMDir /r "$INSTDIR\share\webkitgtk-3.0"
 	RMDir /r "$INSTDIR\share\xml\dbus-1"
+	RMDir /r "$INSTDIR\ssl\certs"
 
 	FindFirst $0 $1 "$INSTDIR\share\locale\*"
 	loop:
@@ -361,6 +362,8 @@ Section Uninstall
 	RMDir "$INSTDIR\share\locale"
 	RMDir "$INSTDIR\share\xml"
 	RMDir "$INSTDIR\share"
+	RMDir "$INSTDIR\ssl\certs"
+	RMDir "$INSTDIR\ssl"
 	RMDir "$INSTDIR"
 
 	DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}"


Modified: build/gtk-bundle-from-msys2.sh
7 lines changed, 5 insertions(+), 2 deletions(-)
===================================================================
@@ -23,7 +23,9 @@ gtkv="3"
 # gtkspell - for GeanyVC plugin
 # the rest is dependency-dependency
 packages="
+p11-kit
 brotli
+ca-certificates
 ctags
 ctpl-git
 curl
@@ -68,7 +70,6 @@ nettle
 nghttp2
 openssl
 orc
-p11-kit
 readline
 rtmpdump-git
 sqlite3
@@ -255,7 +256,9 @@ cleanup_unnecessary_files() {
 	rm -rf share/readline
 	rm -rf share/zsh
 	# ssl: cleanup ssl files
-	rm -rf ssl
+	rm -rf ssl/*.cnf
+	rm -rf ssl/*.cnf.dist
+	rm -rf ssl/*.pem
 	# bin: cleanup binaries and libs (delete anything except *.dll and binaries we need)
 	find bin \
 		! -name '*.dll' \



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Plugins-Commits mailing list