This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository telekinesis. from b47dabb ship our own Perl-based SFTP server new 237f7c1 fix syntax error, harden string handling new 94fb480 server: Adapt Makefile to install teki-sftpserver into bin:package telekinesis-server. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: server/Makefile | 2 ++ .../pre-suspend.d/100_telekinesis-server-suspend | 6 +++--- .../100_telekinesis-server-terminate | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository telekinesis. commit 237f7c1a85802266d0fa37054f034423f6fa0c3c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 1 10:08:31 2014 +0200 fix syntax error, harden string handling --- .../pre-suspend.d/100_telekinesis-server-suspend | 6 +++--- .../100_telekinesis-server-terminate | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend b/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend index 8ba7ad7..799695f 100755 --- a/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend +++ b/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend @@ -21,8 +21,8 @@ export X2GO_SESSION=$1 -X2GO_SESSIONINFO=$(x2golistsessions | grep $X2GO_SESSION) -TEKICTRL_PORT=$(echo $X2GO_SESSIONINFO | cut -d "|" -f15 | sed -e "s/[^0-9\-]//g") +X2GO_SESSIONINFO="$(x2golistsessions | grep $X2GO_SESSION)" +TEKICTRL_PORT="$(echo $X2GO_SESSIONINFO | cut -d '|' -f15 | sed -e 's/[^0-9\-]//g')" TEKIDATA_LOCK="$HOME/.x2go/C-${X2GO_SESSION}/telekinesis-sftp.pid" # if Telekinesis server is in use for this session, try to resume it @@ -30,7 +30,7 @@ if [ -n "$TEKICTRL_PORT" ] && [ "x$TEKICTRL_PORT" != "x-1" ]; then tekicmd -setSESSIONSUSPEND=1 -setX2GOSID=${X2GO_SESSION} (if [ -f "$TEKIDATA_LOCK" ]; then sleep 20 - kill -9 $(cat "$TEKIDATA_LOCK" | sed -s 's/[^0-9]*//g');) + kill -9 $(cat "$TEKIDATA_LOCK" | sed -s 's/[^0-9]*//g'); fi;) & fi diff --git a/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate b/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate index 8ba7ad7..799695f 100755 --- a/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate +++ b/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate @@ -21,8 +21,8 @@ export X2GO_SESSION=$1 -X2GO_SESSIONINFO=$(x2golistsessions | grep $X2GO_SESSION) -TEKICTRL_PORT=$(echo $X2GO_SESSIONINFO | cut -d "|" -f15 | sed -e "s/[^0-9\-]//g") +X2GO_SESSIONINFO="$(x2golistsessions | grep $X2GO_SESSION)" +TEKICTRL_PORT="$(echo $X2GO_SESSIONINFO | cut -d '|' -f15 | sed -e 's/[^0-9\-]//g')" TEKIDATA_LOCK="$HOME/.x2go/C-${X2GO_SESSION}/telekinesis-sftp.pid" # if Telekinesis server is in use for this session, try to resume it @@ -30,7 +30,7 @@ if [ -n "$TEKICTRL_PORT" ] && [ "x$TEKICTRL_PORT" != "x-1" ]; then tekicmd -setSESSIONSUSPEND=1 -setX2GOSID=${X2GO_SESSION} (if [ -f "$TEKIDATA_LOCK" ]; then sleep 20 - kill -9 $(cat "$TEKIDATA_LOCK" | sed -s 's/[^0-9]*//g');) + kill -9 $(cat "$TEKIDATA_LOCK" | sed -s 's/[^0-9]*//g'); fi;) & fi -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository telekinesis. commit 94fb480d44ace352265d4daca293307838deafaf Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 1 10:09:45 2014 +0200 server: Adapt Makefile to install teki-sftpserver into bin:package telekinesis-server. --- server/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/Makefile b/server/Makefile index aae208b..8c825fb 100755 --- a/server/Makefile +++ b/server/Makefile @@ -59,6 +59,8 @@ install: install_scripts install_config install_data install_man install_version install_scripts: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/server/bin/ + $(INSTALL_PROGRAM) lib/telekinesis/server/bin/* $(DESTDIR)$(LIBDIR)/server/bin/ $(INSTALL_DIR) $(DESTDIR)$(X2GO_LIBDIR)/extensions/post-start.d/ $(INSTALL_DIR) $(DESTDIR)$(X2GO_LIBDIR)/extensions/pre-suspend.d/ $(INSTALL_DIR) $(DESTDIR)$(X2GO_LIBDIR)/extensions/pre-resume.d/ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git
-
git-admin＠x2go.org