Commit 485bb114 authored by Antenore Gatta's avatar Antenore Gatta

Merge branch 'buildissues' into 'master'

Debian Lintian, appstream and AppImage detected issues fixes

See merge request Remmina/Remmina!1901
parents 88fcce0d 2227a2f8
......@@ -118,8 +118,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${REMMINA_APP_ID}.desktop.in
${CMAKE_CURRENT_BINARY_DIR}/${REMMINA_APP_ID}.desktop @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remmina-file.desktop.in
${CMAKE_CURRENT_BINARY_DIR}/remmina-file.desktop @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remmina-file-wrapper.sh.in
${CMAKE_CURRENT_BINARY_DIR}/remmina-file-wrapper.sh @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remmina-file-wrapper.in
${CMAKE_CURRENT_BINARY_DIR}/remmina-file-wrapper @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${REMMINA_APP_ID}.desktop
DESTINATION "${REMMINA_DATADIR}/applications")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina-file.desktop
......@@ -127,7 +127,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina-file.desktop
install(FILES ${REMMINA_APP_ID}.appdata.xml
DESTINATION "${REMMINA_DATADIR}/metainfo")
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina-file-wrapper.sh
FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina-file-wrapper
DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
)
......@@ -178,6 +178,10 @@ if(WITH_MANPAGES)
FILES gnome-session-remmina.1
DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1
)
install(
FILES remmina-file-wrapper.1
DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1
)
endif()
# XML mime types
......
......@@ -67,8 +67,8 @@ Comment[th]=เชื่อมต่อไปยังพื้นโต๊ะ
Comment[tr]=Uzak masaüstlerine bağlan
Comment[uk]=Приєднатися до віддаленого комп’ютера
Comment[zh_CN]=连接到远程桌面
TryExec=@CMAKE_INSTALL_FULL_BINDIR@/remmina-file-wrapper.sh
Exec=@CMAKE_INSTALL_FULL_BINDIR@/remmina-file-wrapper.sh %U
TryExec=remmina-file-wrapper
Exec=remmina-file-wrapper %U
Icon=@REMMINA_ICON@
Terminal=false
Type=Application
......
.Dd August 30, 2019
.Dt remmina-file-wrapper 1
.Os Linux
.Sh NAME
.Nm remmina-file-wrapper
.Sh SYNOPSIS
.Nm
.Op Ar protocol:///file
.Op Ar remmina options
.Sh DESCRIPTION
Wrapper script to execute Remmina with protocol handlers.
.Sh SEE ALSO
.Xr remmina 1
.Sh AUTHORS
.An Antenore Gatta Aq Mt antenore@simbiosi.org
#!/bin/bash -
#!/usr/bin/env bash
#===============================================================================
#
# FILE: remmina-file-wrapper.sh
# FILE: remmina-file-wrapper
#
# USAGE: ./remmina-file-wrapper.sh
# USAGE: ./remmina-file-wrapper
#
# DESCRIPTION: Wrapper used by xdg to connect or edit a remmina file clicking
# on it, or clicking to an URL like remmina:///profile.remmina
......@@ -22,19 +22,19 @@
set -o nounset # Treat unset variables as an error
case "$@" in
*rdp:*)
@REMMINA_BINARY_PATH@ "${@#rdp:\/\/}"
;;
*spice:*)
@REMMINA_BINARY_PATH@ "${@#spice:\/\/}"
;;
*vnc:*)
@REMMINA_BINARY_PATH@ "${@#vnc:\/\/}"
;;
*remmina:*)
@REMMINA_BINARY_PATH@ "${@#remmina:\/\/}"
;;
*)
@REMMINA_BINARY_PATH@ "${@}"
;;
*rdp:*)
@REMMINA_BINARY_PATH@ "${@#rdp:\/\/}"
;;
*spice:*)
@REMMINA_BINARY_PATH@ "${@#spice:\/\/}"
;;
*vnc:*)
@REMMINA_BINARY_PATH@ "${@#vnc:\/\/}"
;;
*remmina:*)
@REMMINA_BINARY_PATH@ "${@#remmina:\/\/}"
;;
*)
@REMMINA_BINARY_PATH@ "${@}"
;;
esac
......@@ -4,18 +4,14 @@ Type=Application
Name=Remmina Connect
Comment=Access remote desktops with Remmina
TryExec=@REMMINA_BINARY_PATH@
Exec=@CMAKE_INSTALL_FULL_BINDIR@/remmina-file-wrapper.sh -c %U
Exec=remmina-file-wrapper.sh -c %U
Icon=@REMMINA_ICON@
MimeType=application/x-remmina;
MimeType=application/x-remmina;x-scheme-handler/remmina;x-scheme-handler/rdp;x-scheme-handler/spice;x-scheme-handler/vnc
Actions=Edit;
Terminal=false
StartupNotify=true
NoDisplay=true
X-Desktop-File-Install-Version=0.24
x-scheme-handler/remmina=remmina-file.desktop
x-scheme-handler/rdp=remmina-file.desktop
x-scheme-handler/spice=remmina-file.desktop
x-scheme-handler/vnc=remmina-file.desktop
[Desktop Action Edit]
Name=Remmina Edit
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment