From 56a49ed5e31f8fb62323afe223d57fea6cba7508 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 6 Jun 2024 15:15:36 +0200 Subject: [PATCH 1/2] Windows installer: fix livetrax manual link and welcome page --- tools/x-win/package.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index 4efb01d166..93942a4776 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -59,6 +59,7 @@ while [ $# -gt 0 ] ; do PROGRAM_NAME=LiveTrax PROGRAM_KEY=LiveTrax PRODUCT_NAME=LiveTrax + MANUAL_NAME="livetrax-live-manual" shift ;; --chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;; esac @@ -464,7 +465,7 @@ InstallDirRegKey HKLM "Software\\${PRODUCT_NAME}\\${PRODUCT_ID}\\$WARCH" "Instal EOF -if test -n "$MIXBUS"; then +if test -n "$MIXBUS" -o -n "$LIVETRAX" ; then # TODO: proper welcome/finish text. cat >> $NSISFILE << EOF From c000f77ce26f21a6a442f53e3c26b8818d16acc3 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 6 Jun 2024 15:25:50 +0200 Subject: [PATCH 2/2] Windows installer: update links to manual --- tools/x-win/package.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index 93942a4776..715bac1d01 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -49,7 +49,7 @@ while [ $# -gt 0 ] ; do PROGRAM_NAME=Mixbus PROGRAM_KEY=Mixbus PRODUCT_NAME=Mixbus - MANUAL_NAME="mixbus-live-manual" + MANUAL_URL="https://rsrc.harrisonconsoles.com/mixbus/mixbus-live-manual/" shift ;; --livetrax) LIVETRAX=1 ; @@ -59,7 +59,7 @@ while [ $# -gt 0 ] ; do PROGRAM_NAME=LiveTrax PROGRAM_KEY=LiveTrax PRODUCT_NAME=LiveTrax - MANUAL_NAME="livetrax-live-manual" + MANUAL_URL="https://rsrc.harrisonconsoles.com/livetrax/livetrax-live-manual/" shift ;; --chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;; esac @@ -472,7 +472,7 @@ if test -n "$MIXBUS" -o -n "$LIVETRAX" ; then !define MUI_FINISHPAGE_TITLE "Welcome to Harrison ${PROGRAM_NAME}" !define MUI_FINISHPAGE_TEXT "Thanks for your purchase of ${PROGRAM_NAME}!\$\\r\$\\nYou will find the ${PROGRAM_NAME} application in the Start Menu (or the All Apps panel for Windows 8) \$\\r\$\\nClick the link below to view the ${PROGRAM_NAME} manual, and learn ways to get involved with the Mixbus community." !define MUI_FINISHPAGE_LINK "${PROGRAM_NAME} Manual" -!define MUI_FINISHPAGE_LINK_LOCATION "https://rsrc.harrisonconsoles.com/mixbus/${MANUAL_NAME}/" +!define MUI_FINISHPAGE_LINK_LOCATION "${MANUAL_URL}" !define MUI_FINISHPAGE_NOREBOOTSUPPORT EOF