From 4741aaeb392239e6e484701e02e0ca18c9a47db7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Aug 2012 14:34:12 -0500 Subject: Making the session call the socket sucker --- Makefile.am | 9 +++++++-- freerdp-session | 7 ------- freerdp-session.in | 9 +++++++++ 3 files changed, 16 insertions(+), 9 deletions(-) delete mode 100755 freerdp-session create mode 100755 freerdp-session.in diff --git a/Makefile.am b/Makefile.am index d31c18c..3d9a94a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,10 @@ session_startdir = $(pkglibexecdir) session_start_SCRIPTS = \ freerdp-session +freerdp-session: freerdp-session.in + @sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ + @chmod +x $@ + libexec_PROGRAMS = \ socket-sucker socket_sucker_SOURCES = \ @@ -22,10 +26,11 @@ socket_sucker_SOURCES = \ EXTRA_DIST = \ $(pam_session_DATA) \ freerdp.desktop.in \ - freerdp-session + freerdp-session.in CLEANFILES = \ - freerdp.desktop + freerdp.desktop \ + freerdp-session DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall diff --git a/freerdp-session b/freerdp-session deleted file mode 100755 index d304a98..0000000 --- a/freerdp-session +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ -e ~/.freerdp-socket ]; then - cat ~/.freerdp-socket | /usr/bin/xfreerdp --plugin rdpsnd.so --no-nla -f --from-stdin -else - zenity --warning --text="Unable to locate FreeRDP socket" -fi; diff --git a/freerdp-session.in b/freerdp-session.in new file mode 100755 index 0000000..8868336 --- /dev/null +++ b/freerdp-session.in @@ -0,0 +1,9 @@ +#!/bin/bash + +if [ -e ~/.freerdp-socket ]; then + @pkglibexecdir@/socket-sucker | /usr/bin/xfreerdp --plugin rdpsnd.so --no-nla -f --from-stdin +else + zenity --warning --text="Unable to locate FreeRDP socket" +fi; + +rm -f ~/.freerdp-socket -- cgit v1.2.3