Merge pull request #3566 from telepresenceio/thallgren/post-merge-fixes

Post merge fixes
telepresenceio · Apr 5, 2024 · 3cc4d10 · 3cc4d10
2 parents 09206de + 20b5f11
commit 3cc4d10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 86 deletions.
diff --git a/packaging/windows-package.sh b/packaging/windows-package.sh
@@ -50,8 +50,8 @@ zip -r -j "${BINDIR}/telepresence.zip" "${ZIPDIR}"
 # Generate installer
 cp "${SCRIPT_DIR}/sidebar.png" "${ZIPDIR}/sidebar.png"
 TELEPRESENCE_PLAIN_VERSION=${TELEPRESENCE_VERSION#"v"}
-sed s/TELEPRESENCE_VERSION/$TELEPRESENCE_PLAIN_VERSION/ "${SCRIPT_DIR}/telepresence.wxs.in" > "${ZIPDIR}/telepresence.wxs"
-sed s/TELEPRESENCE_VERSION/$TELEPRESENCE_PLAIN_VERSION/ "${SCRIPT_DIR}/bundle.wxs.in" > "${ZIPDIR}/bundle.wxs"
+sed s/TELEPRESENCE_VERSION/"$TELEPRESENCE_PLAIN_VERSION"/ "${SCRIPT_DIR}/telepresence.wxs.in" > "${ZIPDIR}/telepresence.wxs"
+sed s/TELEPRESENCE_VERSION/"$TELEPRESENCE_PLAIN_VERSION"/ "${SCRIPT_DIR}/bundle.wxs.in" > "${ZIPDIR}/bundle.wxs"
 
 WIX_VERSION=4.0.4
 dotnet tool install --global wix --version $WIX_VERSION

diff --git a/pkg/agentmap/workload_cache.go b/pkg/agentmap/workload_cache.go