Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remmina.desktop: Use full path to execute remmina #607

Merged
merged 1 commit into from
Jul 13, 2015

Conversation

lanoxx
Copy link
Contributor

@lanoxx lanoxx commented Jul 13, 2015

This patch makes sure that when remmina is started via the desktop
file it always starts the binary shipped with the distribution
and not another remmina binary that my have higher precedence
in the search path, such as in /usr/local/bin/.

Without this patch, if there is a remmina binary in /usr/local/bin, for example because the user previously compiled remmina, and then decided to go back to the distribution version, but the binary was not correctly cleaned up, then the .desktop file installed by the distribution will try to execute the binary in /usr/local/bin instead of /usr/bin, which can be a very annoying cause of errors.

With this patch, if the user installs both Remmina from the distribution and compiles a newer version by himself, then he will end up with to .desktop files, one in /usr/share/applications/remmina.desktop and another one in /usr/local/share/applications/desktop/.

I am currently not able to compile Remmina on my machine so please test this patch before you merge it.

This patch makes sure that when remmina is started via the desktop
file it always starts the binary shipped with the distribution
and not another remmina binary that my have higher precedence
in the search path, such as in /usr/local/bin/.
@antenore
Copy link
Member

Cool! Thanks a lot. I'll test it ASAP

@antenore
Copy link
Member

Look at my fix.

Without that, bindir is empty, and it will install the remmina binary under /

@lanoxx
Copy link
Contributor Author

lanoxx commented Jul 14, 2015

Awesome. Thanks for merging.

@giox069
Copy link
Contributor

giox069 commented Jul 14, 2015

The automatic build of the Ububtu PPA failed with

-- Installing: /«PKGBUILDDIR»/debian/tmp/usr/share/icons/hicolor/24x24/apps/remmina.png
-- Installing: /«PKGBUILDDIR»/debian/tmp/usr/share/icons/hicolor/32x32/apps/remmina.png
-- Installing: /«PKGBUILDDIR»/debian/tmp/usr/share/icons/hicolor/48x48/apps/remmina.png
-- Installing: /«PKGBUILDDIR»/debian/tmp/usr/share/icons/hicolor/scalable/apps/remmina.svg
CMake Error at remmina/desktop/cmake_install.cmake:116 (file):
  file INSTALL cannot find
  "/«PKGBUILDDIR»/remmina/desktop/remmina.desktop".
Call Stack (most recent call first):
  remmina/cmake_install.cmake:63 (include)
  cmake_install.cmake:37 (include)

any idea ?
Full log here:
https://launchpadlibrarian.net/211585622/buildlog_ubuntu-utopic-i386.remmina_1.1.1-1%2B764%2Bnext%2B201507140319~ubuntu14.10.1_BUILDING.txt.gz

@antenore
Copy link
Member

I'm taking a look, it's really strange..

@antenore
Copy link
Member

I cannot reproduce it on my environment, I'm going to rollback the last merge.

@lanoxx please take a look at the logs and try to replicate and fix the issue.

Thanks!

antenore added a commit that referenced this pull request Jul 14, 2015
antenore added a commit that referenced this pull request Jul 14, 2015
antenore added a commit that referenced this pull request Jul 16, 2015
akallabeth pushed a commit to akallabeth/Remmina that referenced this pull request Jan 21, 2016
akallabeth pushed a commit to akallabeth/Remmina that referenced this pull request Jan 21, 2016
akallabeth pushed a commit to akallabeth/Remmina that referenced this pull request Jan 21, 2016
akallabeth pushed a commit to akallabeth/Remmina that referenced this pull request Jan 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants