From 2b9932c36f9ae485c51e8140f41faffc91347adf Mon Sep 17 00:00:00 2001 From: vadym Date: Wed, 21 Dec 2022 12:37:11 +0200 Subject: [PATCH] added favicon RIVM-40 --- contrib/msi/build-msi-gui.sh | 1 + contrib/msi/build-msi-ie.sh | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/contrib/msi/build-msi-gui.sh b/contrib/msi/build-msi-gui.sh index b46f6d8f..8ec57435 100644 --- a/contrib/msi/build-msi-gui.sh +++ b/contrib/msi/build-msi-gui.sh @@ -106,6 +106,7 @@ else exit 1 fi +cp riv.ico "$PKGUIFOLDER"/favicon.ico PKG_UI_ASSETS_ZIP=$(pwd)/ui.zip ( cd "$PKGUIFOLDER" && 7z a "$PKG_UI_ASSETS_ZIP" * ) PKG_UI_ASSETS_ZIP=ui.zip diff --git a/contrib/msi/build-msi-ie.sh b/contrib/msi/build-msi-ie.sh index 7c67734a..7e657f07 100644 --- a/contrib/msi/build-msi-ie.sh +++ b/contrib/msi/build-msi-ie.sh @@ -84,10 +84,19 @@ then unzip wintun.zip fi +cp riv.ico "$PKGUIFOLDER"/favicon.ico PKG_UI_ASSETS_ZIP=$(pwd)/ui.zip ( cd "$PKGUIFOLDER" && 7z a "$PKG_UI_ASSETS_ZIP" * ) PKG_UI_ASSETS_ZIP=ui.zip +#Build winres +go-winres simply --icon riv.ico --file-version $PKGVERSION --file-description "RiV-mesh (c) service, 2022 RIV CHAIN" \ +--product-version $PKGVERSION --product-name "RiV-mesh" --copyright "Copyright (c) 2022, RIV CHAIN" +cp *.syso cmd/mesh +go-winres simply --file-version $PKGVERSION --file-description "RiV-mesh (c) CLI, 2022 RIV CHAIN" \ +--product-version $PKGVERSION --product-name "RiV-mesh" --copyright "Copyright (c) 2022, RIV CHAIN" --manifest cli +cp *.syso cmd/meshctl + if [ $PKGARCH = "x64" ]; then PKGWINTUNDLL=wintun/bin/amd64/wintun.dll elif [ $PKGARCH = "x86" ]; then @@ -208,7 +217,6 @@ cat > wix.xml << EOF KeyPath="yes"/> - wix.xml << EOF Source="${PKG_UI_ASSETS_ZIP}" /> -