diff --git a/blueprints/fs-7.1.11/000.bash b/blueprints/fs-7.1.11/000.bash index 31e34b5fb3..cb8901df80 100644 --- a/blueprints/fs-7.1.11/000.bash +++ b/blueprints/fs-7.1.11/000.bash @@ -3,5 +3,6 @@ maybe-clone viewer ${hub:-github.com} $repo "$ref" maybe-clone p373r github.com ${GITHUB_REPOSITORY} P373R_6.6.8 pushd repo/viewer patch -p1 < $nunja_dir/../fs-7.1.11/installer_template.nsi.patch + patch -p1 < $nunja_dir/../fs-7.1.11/viewer_manifest.DL_URL.patch git diff popd \ No newline at end of file diff --git a/blueprints/fs-7.1.11/installer_template.nsi.patch b/blueprints/fs-7.1.11/installer_template.nsi.patch index 8c72480768..cbac1bafd8 100644 --- a/blueprints/fs-7.1.11/installer_template.nsi.patch +++ b/blueprints/fs-7.1.11/installer_template.nsi.patch @@ -10,7 +10,7 @@ index 29ae1e54f05..a21e6c26661 100644 + ${WordReplace} "$(MissingAVX2)" "%DLURL%" "${DL_URL}-legacy-cpus" "+*" $3 MessageBox MB_OK "$3" - ${OpenURL} '$2' -+ ${OpenURL} "${DL_URL}-legacy-cpus#version-${VERSION_LONG}" ++ ${OpenURL} "${DL_URL}-legacy-cpus" Quit OK_AVX2: @@ -19,19 +19,7 @@ index 29ae1e54f05..a21e6c26661 100644 MessageBox MB_YESNO $3 IDYES DownloadAVX2 IDNO ContinueInstall DownloadAVX2: - ${OpenURL} '$3' -+ ${OpenURL} "${DL_URL}#version-${VERSION_LONG}" ++ ${OpenURL} "${DL_URL}" Quit ContinueInstall: Pop $3 -diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py -index 9fa11fd534c..0dcc76d3ab3 100755 ---- a/indra/newview/viewer_manifest.py -+++ b/indra/newview/viewer_manifest.py -@@ -939,6 +939,7 @@ class Windows_x86_64_Manifest(ViewerManifest): - return result - # - def dl_url_from_channel(self): -+ return "https://github.com/humbletim/firestorm-gha/wiki/downloads" - if self.channel_type() == 'release': - return 'https://www.firestormviewer.org/choose-your-platform' - elif self.channel_type() == 'beta': diff --git a/blueprints/fs-7.1.11/viewer_manifest.DL_URL.patch b/blueprints/fs-7.1.11/viewer_manifest.DL_URL.patch new file mode 100644 index 0000000000..49e392e259 --- /dev/null +++ b/blueprints/fs-7.1.11/viewer_manifest.DL_URL.patch @@ -0,0 +1,12 @@ +diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py +index 9fa11fd534c..0dcc76d3ab3 100755 +--- a/indra/newview/viewer_manifest.py ++++ b/indra/newview/viewer_manifest.py +@@ -939,6 +939,7 @@ class Windows_x86_64_Manifest(ViewerManifest): + return result + # + def dl_url_from_channel(self): ++ return str.format('https://github.com/humbletim/firestorm-gha/releases/#v{}', os.getenv('version_xyz')) + if self.channel_type() == 'release': + return 'https://www.firestormviewer.org/choose-your-platform' + elif self.channel_type() == 'beta': diff --git a/blueprints/sgeo-7.1.11/000.bash b/blueprints/sgeo-7.1.11/000.bash index 1fbca00376..80157468b9 100644 --- a/blueprints/sgeo-7.1.11/000.bash +++ b/blueprints/sgeo-7.1.11/000.bash @@ -34,5 +34,6 @@ popd pushd repo/viewer patch -p1 < $nunja_dir/../fs-7.1.11/installer_template.nsi.patch + patch -p1 < $nunja_dir/../fs-7.1.11/viewer_manifest.DL_URL.patch git diff popd