review fixes

This commit is contained in:
Adam Velebil 2022-10-07 10:18:32 +02:00
parent c0eb83831e
commit 83818e4ae2
No known key found for this signature in database
GPG Key ID: AC6D6B9D715FC084
3 changed files with 11 additions and 6 deletions

View File

@ -121,6 +121,11 @@ install(DIRECTORY "../build/linux/helper" DESTINATION "${BUILD_BUNDLE_DIR}" USE_
# Copy Linux support files # Copy Linux support files
install(DIRECTORY "../resources/linux/linux_support" DESTINATION "${BUILD_BUNDLE_DIR}" USE_SOURCE_PERMISSIONS) install(DIRECTORY "../resources/linux/linux_support" DESTINATION "${BUILD_BUNDLE_DIR}" USE_SOURCE_PERMISSIONS)
install(FILES "../resources/linux/README.adoc" DESTINATION "${BUILD_BUNDLE_DIR}") install(FILES "../resources/linux/README.adoc" DESTINATION "${BUILD_BUNDLE_DIR}")
install(FILES "../assets/graphics/app-icon.png"
DESTINATION "${BUILD_BUNDLE_DIR}/linux_support"
RENAME "com.yubico.yubioath.png")
install(FILES "../resources/linux/desktop_integration.sh" install(FILES "../resources/linux/desktop_integration.sh"
DESTINATION "${BUILD_BUNDLE_DIR}" DESTINATION "${BUILD_BUNDLE_DIR}"
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE) PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)

View File

@ -16,16 +16,14 @@
# limitations under the License. # limitations under the License.
# #
VERSION="6.0.0"
PRODUCT_NAME="Yubico Authenticator $VERSION"
DESKTOP_FILENAME="com.yubico.authenticator.desktop" DESKTOP_FILENAME="com.yubico.authenticator.desktop"
DESKTOP_FILE="${HOME}/.local/share/applications/${DESKTOP_FILENAME}" DESKTOP_FILE="${HOME}/.local/share/applications/${DESKTOP_FILENAME}"
EXEC_PATH=$(pwd) EXEC_DIRNAME=$(dirname "$0")
EXEC_PATH=$(cd "$EXEC_DIRNAME" && pwd)
help() { help() {
echo "Integrate Yubico Authenticator 6.0 with common desktop environments." echo "Integrate Yubico Authenticator with common desktop environments."
echo echo
echo "Usage: -i | --install -- install desktop file" echo "Usage: -i | --install -- install desktop file"
echo " -u | --uninstall -- uninstall desktop file" echo " -u | --uninstall -- uninstall desktop file"
@ -33,7 +31,9 @@ help() {
} }
install() { install() {
cat "./linux_support/${DESKTOP_FILENAME}" | sed -e "s|@EXEC_PATH|${EXEC_PATH}|g" >"${DESKTOP_FILE}" sed -e "s|@EXEC_PATH|${EXEC_PATH}|g" \
<"${EXEC_PATH}/linux_support/${DESKTOP_FILENAME}" \
>"${DESKTOP_FILE}"
echo "Created file: ${DESKTOP_FILE}" echo "Created file: ${DESKTOP_FILE}"
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB