Skip to content
This repository has been archived by the owner on Feb 12, 2023. It is now read-only.

Commit

Permalink
fix(Windows): Fix starting qTox from installer
Browse files Browse the repository at this point in the history 
Regular ShellExecAsUser plugin doesn't support Unicode. Change to their
"Unicode Update" version. See
https://nsis.sourceforge.io/ShellExecAsUser_plug-in#Download

Missed when updating installers to Unicode mode in
9f84184
  • Loading branch information
@anthonybilinski
anthonybilinski committed Mar 8, 2022
1 parent 3744ecf commit beb38fa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion buildscripts/build_nsisshellexecasuser_windows.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ set -euo pipefail

"$(dirname "$0")"/download/download_nsisshellexecasuser.sh

cp ShellExecAsUser.dll /usr/share/nsis/Plugins/x86-unicode
cp unicode/ShellExecAsUser.dll /usr/share/nsis/Plugins/x86-unicode
11 changes: 5 additions & 6 deletions buildscripts/download/download_nsisshellexecasuser.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,15 @@

set -euo pipefail

NSISSHELLEXECASUSER_HASH=8fc19829e144716a422b15a85e718e1816fe561de379b2b5ae87ef9017490799
NSISSHELLEXECASUSER_HASH=79bdd3e54a9ba9c30af85557b475d2322286f8726687f2e23afa772aac6049ab

source "$(dirname "$0")/common.sh"

# Backup: https://web.archive.org/web/20171008011417/http://nsis.sourceforge.net/mediawiki/images/c/c7/ShellExecAsUser.zip
download_file http://nsis.sourceforge.net/mediawiki/images/c/c7/ShellExecAsUser.zip
download_file https://nsis.sourceforge.io/mediawiki/images/1/1d/ShellExecAsUserUnicodeUpdate.zip

This comment has been minimized.

Sign in to view

Copy link
@nurupo

nurupo Mar 14, 2022

Contributor

Why not backup it via Wayback Machine just in case the download goes down? While other dependencies qTox uses are rather widespread and mirrored all over the Internet, this particular plugin, if the DL goes down, will likely be just gone (or at least a lot harder to find than other deps). Sure, saving it on Wayback Machine might not be as reliable as storing the thing directly in the repo, but it takes a second to do and is better than nothing.

Here is an archived link:

https://web.archive.org/web/20220314233613/https://nsis.sourceforge.io/mediawiki/images/1/1d/ShellExecAsUserUnicodeUpdate.zip

This comment has been minimized.

Sign in to view

Copy link
@anthonybilinski

anthonybilinski Mar 16, 2022

Author Member

Fair point, it did seem elusive when I was adding the unicode version. Created a PR to add the link in a comment like was done before: #6573

if ! check_sha256 "$NSISSHELLEXECASUSER_HASH" ShellExecAsUser.zip; then
if ! check_sha256 "$NSISSHELLEXECASUSER_HASH" ShellExecAsUserUnicodeUpdate.zip; then
exit 1
fi

unzip ShellExecAsUser.zip
rm ShellExecAsUser.zip
unzip ShellExecAsUserUnicodeUpdate.zip
rm ShellExecAsUserUnicodeUpdate.zip

0 comments on commit beb38fa

Please sign in to comment.